Changeset 54944 in vbox for trunk

Timestamp:

Mar 25, 2015 3:23:50 PM (10 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

99192

Message:

replaced a few more AssertPtrReturn by AssertReturn as we don't need to check for a valid pointer after RTMem*

Location:

trunk/src/VBox

Files:

• Additions/common/VBoxService/VBoxServiceControl.cpp (modified) (1 diff)
• Devices/Storage/DrvSCSIHost.cpp (modified) (1 diff)
• Main/src-client/UsbCardReader.cpp (modified) (1 diff)
• NetworkServices/NetLib/VBoxNetPortForwardString.cpp (modified) (1 diff)

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceControl.cpp

@@ -202 +202 @@
     AssertReturn(RT_IS_POWER_OF_TWO(cbScratchBuf), VERR_INVALID_PARAMETER);
     uint8_t *pvScratchBuf = (uint8_t*)RTMemAlloc(cbScratchBuf);
-    AssertPtrReturn(pvScratchBuf, VERR_NO_MEMORY);
+    AssertReturn(pvScratchBuf, VERR_NO_MEMORY);
 
     VBGLR3GUESTCTRLCMDCTX ctxHost = { g_uControlSvcClientID };

trunk/src/VBox/Devices/Storage/DrvSCSIHost.cpp

@@ -286 +286 @@
 
                 paSG = (sg_iovec_t *)RTMemAllocZ(pRequest->cScatterGatherEntries * sizeof(sg_iovec_t));
-                AssertPtrReturn(paSG, VERR_NO_MEMORY);
+                AssertReturn(paSG, VERR_NO_MEMORY);
 
                 for (unsigned i = 0; i < pRequest->cScatterGatherEntries; i++)

trunk/src/VBox/Main/src-client/UsbCardReader.cpp

@@ -550 +550 @@
     {
         pvInBufferCopy = RTMemDup(pvInBuffer, cbInBuffer);
-        AssertPtrReturn(pvInBufferCopy, VERR_NO_MEMORY);
+        AssertReturn(pvInBufferCopy, VERR_NO_MEMORY);
     }
     int rc = RTReqQueueCallEx(pThis->hReqQCardReaderCmd, NULL, 0, RTREQFLAGS_VOID | RTREQFLAGS_NO_WAIT,

trunk/src/VBox/NetworkServices/NetLib/VBoxNetPortForwardString.cpp

@@ -246 +246 @@
 
     pszRaw = RTStrDup(pcszStrPortForward);
-
-    AssertPtrReturn(pszRaw, VERR_NO_MEMORY);
+    AssertReturn(pszRaw, VERR_NO_MEMORY);
 
     pszRawBegin = pszRaw;