Changeset 40938 in vbox for trunk/src/VBox/Runtime/common/alloc

Timestamp:

Apr 16, 2012 11:58:26 AM (13 years ago)

Author:

vboxsync

Message:

runtime: backed out r77481,r77482,r77483,r77484,r77485

Location:

trunk/src/VBox/Runtime/common/alloc

Files:

• heapoffset.cpp (modified) (3 diffs)
• heapsimple.cpp (modified) (6 diffs)

trunk/src/VBox/Runtime/common/alloc/heapoffset.cpp

@@ -508 +508 @@
 static PRTHEAPOFFSETBLOCK rtHeapOffsetAllocBlock(PRTHEAPOFFSETINTERNAL pHeapInt, size_t cb, size_t uAlignment)
 {
-    PRTHEAPOFFSETBLOCK  pRet = (PRTHEAPOFFSETBLOCK)NULL;
+    PRTHEAPOFFSETBLOCK  pRet = NULL;
     PRTHEAPOFFSETFREE   pFree;
 
-    AssertReturn((pHeapInt)->u32Magic == RTHEAPOFFSET_MAGIC, (PRTHEAPOFFSETBLOCK)NULL);
+    AssertReturn((pHeapInt)->u32Magic == RTHEAPOFFSET_MAGIC, NULL);
 #ifdef RTHEAPOFFSET_STRICT
     rtHeapOffsetAssertAll(pHeapInt);
@@ -704 +704 @@
      * of us (both lists are sorted by address).
      */
-    pLeft = (PRTHEAPOFFSETFREE)NULL;
-    pRight = (PRTHEAPOFFSETFREE)NULL;
+    pLeft = NULL;
+    pRight = NULL;
     if (pHeapInt->offFreeTail)
     {
@@ -814 +814 @@
 static void rtHeapOffsetAssertAll(PRTHEAPOFFSETINTERNAL pHeapInt)
 {
-    PRTHEAPOFFSETFREE pPrev = (PRTHEAPOFFSETFREE)NULL;
-    PRTHEAPOFFSETFREE pPrevFree = (PRTHEAPOFFSETFREE)NULL;
+    PRTHEAPOFFSETFREE pPrev = NULL;
+    PRTHEAPOFFSETFREE pPrevFree = NULL;
     PRTHEAPOFFSETFREE pBlock;
     for (pBlock = (PRTHEAPOFFSETFREE)(pHeapInt + 1);

trunk/src/VBox/Runtime/common/alloc/heapsimple.cpp

@@ -318 +318 @@
     /* Init the single free block. */
     pFree = pHeapInt->pFreeHead;
-    pFree->Core.pNext = (PRTHEAPSIMPLEBLOCK)NULL;
-    pFree->Core.pPrev = (PRTHEAPSIMPLEBLOCK)NULL;
+    pFree->Core.pNext = NULL;
+    pFree->Core.pPrev = NULL;
     pFree->Core.pHeap = pHeapInt;
     pFree->Core.fFlags = RTHEAPSIMPLEBLOCK_FLAGS_MAGIC | RTHEAPSIMPLEBLOCK_FLAGS_FREE;
-    pFree->pNext = (PRTHEAPSIMPLEFREE)NULL;
-    pFree->pPrev = (PRTHEAPSIMPLEFREE)NULL;
+    pFree->pNext = NULL;
+    pFree->pPrev = NULL;
     pFree->cb = pHeapInt->cbFree;
 
@@ -476 +476 @@
 static PRTHEAPSIMPLEBLOCK rtHeapSimpleAllocBlock(PRTHEAPSIMPLEINTERNAL pHeapInt, size_t cb, size_t uAlignment)
 {
-    PRTHEAPSIMPLEBLOCK  pRet = (PRTHEAPSIMPLEBLOCK)NULL;
+    PRTHEAPSIMPLEBLOCK  pRet = NULL;
     PRTHEAPSIMPLEFREE   pFree;
 
@@ -533 +533 @@
                 pPrev = (PRTHEAPSIMPLEBLOCK)(pHeapInt + 1);
                 Assert(pPrev == &pFree->Core);
-                pPrev->pPrev = (PRTHEAPSIMPLEBLOCK)NULL;
+                pPrev->pPrev = NULL;
                 pPrev->pNext = &pFree->Core;
                 pPrev->pHeap = pHeapInt;
@@ -696 +696 @@
      * of us (both lists are sorted by address).
      */
-    pLeft = (PRTHEAPSIMPLEFREE)NULL;
-    pRight = (PRTHEAPSIMPLEFREE)NULL;
+    pLeft = NULL;
+    pRight = NULL;
     if (pHeapInt->pFreeTail)
     {
@@ -728 +728 @@
         Assert(pRight == pHeapInt->pFreeHead);
         pFree->Core.fFlags |= RTHEAPSIMPLEBLOCK_FLAGS_FREE;
-        pFree->pPrev = (PRTHEAPSIMPLEFREE)NULL;
+        pFree->pPrev = NULL;
         pFree->pNext = pRight;
         if (pRight)
@@ -806 +806 @@
 static void rtHeapSimpleAssertAll(PRTHEAPSIMPLEINTERNAL pHeapInt)
 {
-    PRTHEAPSIMPLEFREE pPrev = (PRTHEAPSIMPLEFREE)NULL;
-    PRTHEAPSIMPLEFREE pPrevFree = (PRTHEAPSIMPLEFREE)NULL;
+    PRTHEAPSIMPLEFREE pPrev = NULL;
+    PRTHEAPSIMPLEFREE pPrevFree = NULL;
     PRTHEAPSIMPLEFREE pBlock;
     for (pBlock = (PRTHEAPSIMPLEFREE)(pHeapInt + 1);