Changeset 54117 in vbox

Timestamp:

Feb 9, 2015 5:08:28 PM (10 years ago)

Author:

vboxsync

Message:

don't check for VALID_PTR after RTMem*Alloc(), that's overkill

Location:

trunk/src/VBox

Files:

• Devices/Audio/coreaudio.c (modified) (1 diff)
• Storage/VD.cpp (modified) (1 diff)
• Storage/VDI.cpp (modified) (2 diffs)
• Storage/VHD.cpp (modified) (3 diffs)
• Storage/VMDK.cpp (modified) (2 diffs)

trunk/src/VBox/Devices/Audio/coreaudio.c

@@ -300 +300 @@
         return err;
     pRange = RTMemAllocZ(cSize);
-    if (RT_VALID_PTR(pRange))
+    if (pRange)
     {
         err = AudioDeviceGetProperty(device,

trunk/src/VBox/Storage/VD.cpp

@@ -3037 +3037 @@
                  */
                 PRTSGBUF pTmp = (PRTSGBUF)RTMemAlloc(cbPreRead + cbThisWrite + cbPostRead + sizeof(RTSGSEG) + sizeof(RTSGBUF));
-                AssertBreakStmt(VALID_PTR(pTmp), rc = VERR_NO_MEMORY);
+                AssertBreakStmt(pTmp, rc = VERR_NO_MEMORY);
                 PRTSGSEG pSeg = (PRTSGSEG)(pTmp + 1);
 

trunk/src/VBox/Storage/VDI.cpp

@@ -2427 +2427 @@
         {
             pvBuf = RTMemTmpAlloc(cbBlock);
-            AssertBreakStmt(VALID_PTR(pvBuf), rc = VERR_NO_MEMORY);
+            AssertBreakStmt(pvBuf, rc = VERR_NO_MEMORY);
         }
         pvTmp = RTMemTmpAlloc(cbBlock);
-        AssertBreakStmt(VALID_PTR(pvTmp), rc = VERR_NO_MEMORY);
+        AssertBreakStmt(pvTmp, rc = VERR_NO_MEMORY);
 
         uint64_t cbFile;
@@ -2445 +2445 @@
         /* Allocate block array for back resolving. */
         paBlocks2 = (unsigned *)RTMemAlloc(sizeof(unsigned *) * cBlocksAllocated);
-        AssertBreakStmt(VALID_PTR(paBlocks2), rc = VERR_NO_MEMORY);
+        AssertBreakStmt(paBlocks2, rc = VERR_NO_MEMORY);
         /* Fill out back resolving, check/fix allocation errors before
          * compacting the image, just to be on the safe side. Update the

trunk/src/VBox/Storage/VHD.cpp

@@ -2462 +2462 @@
         {
             pvParent = RTMemTmpAlloc(pImage->cbDataBlock);
-            AssertBreakStmt(VALID_PTR(pvParent), rc = VERR_NO_MEMORY);
+            AssertBreakStmt(pvParent, rc = VERR_NO_MEMORY);
         }
         pvBuf = RTMemTmpAlloc(pImage->cbDataBlock);
-        AssertBreakStmt(VALID_PTR(pvBuf), rc = VERR_NO_MEMORY);
+        AssertBreakStmt(pvBuf, rc = VERR_NO_MEMORY);
 
         unsigned cBlocksAllocated = 0;
@@ -2490 +2490 @@
 
         paBlocks = (uint32_t *)RTMemTmpAllocZ(cBlocksAllocated * sizeof(uint32_t));
-        AssertBreakStmt(VALID_PTR(paBlocks), rc = VERR_NO_MEMORY);
+        AssertBreakStmt(paBlocks, rc = VERR_NO_MEMORY);
 
         /* Invalidate the back resolving array. */
@@ -2572 +2572 @@
             RTMemTmpFree(pvBuf);
             pvBuf = RTMemTmpAllocZ(cbBlock);
-            AssertBreakStmt(VALID_PTR(pvBuf), rc = VERR_NO_MEMORY);
+            AssertBreakStmt(pvBuf, rc = VERR_NO_MEMORY);
 
             for (unsigned i = 0; i < cBlocksAllocated; i++)

trunk/src/VBox/Storage/VMDK.cpp

@@ -564 +564 @@
     /* If we get here, there's no matching entry in the cache. */
     pVmdkFile = (PVMDKFILE)RTMemAllocZ(sizeof(VMDKFILE));
-    if (!VALID_PTR(pVmdkFile))
+    if (!pVmdkFile)
     {
         *ppVmdkFile = NULL;
@@ -571 +571 @@
 
     pVmdkFile->pszFilename = RTStrDup(pszFilename);
-    if (!VALID_PTR(pVmdkFile->pszFilename))
+    if (!pVmdkFile->pszFilename)
     {
         RTMemFree(pVmdkFile);