Changeset 2424 in vbox for trunk/src/VBox

Timestamp:

Apr 30, 2007 12:17:10 PM (18 years ago)

Author:

vboxsync

Message:

converted to C style declarations to shush up gcc when building the linux kernel module.

File:

• trunk/src/VBox/Runtime/alloc/heapsimple.cpp (modified) (19 diffs)

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

@@ -281 +281 @@
 RTDECL(int) RTHeapSimpleInit(PRTHEAPSIMPLE pHeap, void *pvMemory, size_t cbMemory)
 {
+    PRTHEAPSIMPLEINTERNAL pHeapInt;
+    PRTHEAPSIMPLEFREE pFree;
+    unsigned i;
+
     /*
      * Validate input. The imposed minimum heap size is just a convenien value.
@@ -292 +296 @@
      * enforce 32 byte alignment of it. Also align the heap size correctly.
      */
-    PRTHEAPSIMPLEINTERNAL pHeapInt = (PRTHEAPSIMPLEINTERNAL)pvMemory;
+    pHeapInt = (PRTHEAPSIMPLEINTERNAL)pvMemory;
     if ((uintptr_t)pvMemory & 31)
     {
@@ -310 +314 @@
                      - sizeof(RTHEAPSIMPLEINTERNAL);
     pHeapInt->pFreeTail = pHeapInt->pFreeHead = (PRTHEAPSIMPLEFREE)(pHeapInt + 1);
-    unsigned i;
     for (i = 0; i < ELEMENTS(pHeapInt->auAlignment); i++)
         pHeapInt->auAlignment[i] = ~(size_t)0;
 
     /* Init the single free block. */
-    PRTHEAPSIMPLEFREE pFree = pHeapInt->pFreeHead;
+    pFree = pHeapInt->pFreeHead;
     pFree->Core.pNext = NULL;
     pFree->Core.pPrev = NULL;
@@ -348 +351 @@
 {
     PRTHEAPSIMPLEINTERNAL pHeapInt = Heap;
+    PRTHEAPSIMPLEBLOCK pBlock;
 
     /*
@@ -370 +374 @@
      * Do the allocation.
      */
-    PRTHEAPSIMPLEBLOCK pBlock = rtHeapSimpleAllocBlock(pHeapInt, cb, cbAlignment);
+    pBlock = rtHeapSimpleAllocBlock(pHeapInt, cb, cbAlignment);
     if (RT_LIKELY(pBlock))
     {
@@ -394 +398 @@
 {
     PRTHEAPSIMPLEINTERNAL pHeapInt = Heap;
+    PRTHEAPSIMPLEBLOCK pBlock;
 
     /*
@@ -416 +421 @@
      * Do the allocation.
      */
-    PRTHEAPSIMPLEBLOCK pBlock = rtHeapSimpleAllocBlock(pHeapInt, cb, cbAlignment);
+    pBlock = rtHeapSimpleAllocBlock(pHeapInt, cb, cbAlignment);
     if (RT_LIKELY(pBlock))
     {
@@ -453 +458 @@
          pFree = pFree->pNext)
     {
+        uintptr_t offAlign;
         ASSERT_BLOCK_FREE(pHeapInt, pFree);
 
@@ -460 +466 @@
         if (pFree->cb < cb)
             continue;
-        uintptr_t offAlign = (uintptr_t)(&pFree->Core + 1) & (uAlignment - 1);
+        offAlign = (uintptr_t)(&pFree->Core + 1) & (uAlignment - 1);
         if (offAlign)
         {
+            RTHEAPSIMPLEFREE Free;
+            PRTHEAPSIMPLEBLOCK pPrev;
+
             offAlign = uAlignment - offAlign;
             if (pFree->cb - offAlign < cb)
@@ -470 +479 @@
              * Make a stack copy of the free block header and adjust the pointer.
              */
-            RTHEAPSIMPLEFREE Free = *pFree;
+            Free = *pFree;
             pFree = (PRTHEAPSIMPLEFREE)((uintptr_t)pFree + offAlign);
 
@@ -482 +491 @@
              * for that.)
              */
-            PRTHEAPSIMPLEBLOCK  pPrev = Free.Core.pPrev;
+            pPrev = Free.Core.pPrev;
             if (pPrev)
             {
@@ -606 +615 @@
 RTDECL(void) RTHeapSimpleFree(RTHEAPSIMPLE Heap, void *pv)
 {
+    PRTHEAPSIMPLEINTERNAL pHeapInt;
+    PRTHEAPSIMPLEBLOCK pBlock;
+
     /*
      * Validate input.
@@ -617 +629 @@
      * Get the block and heap. If in strict mode, validate these.
      */
-    PRTHEAPSIMPLEBLOCK pBlock = (PRTHEAPSIMPLEBLOCK)pv - 1;
-    PRTHEAPSIMPLEINTERNAL pHeapInt = pBlock->pHeap;
+    pBlock = (PRTHEAPSIMPLEBLOCK)pv - 1;
+    pHeapInt = pBlock->pHeap;
     ASSERT_BLOCK_USED(pHeapInt, pBlock);
     ASSERT_ANCHOR(pHeapInt);
@@ -802 +814 @@
 RTDECL(size_t) RTHeapSimpleSize(RTHEAPSIMPLE Heap, void *pv)
 {
+    PRTHEAPSIMPLEINTERNAL pHeapInt;
+    PRTHEAPSIMPLEBLOCK pBlock;
+    size_t cbBlock;
+
     /*
      * Validate input.
@@ -813 +829 @@
      * Get the block and heap. If in strict mode, validate these.
      */
-    PRTHEAPSIMPLEBLOCK pBlock = (PRTHEAPSIMPLEBLOCK)pv - 1;
-    PRTHEAPSIMPLEINTERNAL pHeapInt = pBlock->pHeap;
+    pBlock = (PRTHEAPSIMPLEBLOCK)pv - 1;
+    pHeapInt = pBlock->pHeap;
     ASSERT_BLOCK_USED(pHeapInt, pBlock);
     ASSERT_ANCHOR(pHeapInt);
@@ -822 +838 @@
      * Calculate the block size.
      */
-    const size_t cbBlock = (pBlock->pNext ? (uintptr_t)pBlock->pNext : (uintptr_t)pHeapInt->pvEnd)
-                         - (uintptr_t)pBlock- sizeof(RTHEAPSIMPLEBLOCK);
+    cbBlock = (pBlock->pNext ? (uintptr_t)pBlock->pNext : (uintptr_t)pHeapInt->pvEnd)
+            - (uintptr_t)pBlock- sizeof(RTHEAPSIMPLEBLOCK);
     return cbBlock;
 }
@@ -841 +857 @@
 RTDECL(size_t) RTHeapSimpleGetHeapSize(RTHEAPSIMPLE Heap)
 {
+    PRTHEAPSIMPLEINTERNAL pHeapInt;
+
     if (Heap == NIL_RTHEAPSIMPLE)
         return 0;
-    PRTHEAPSIMPLEINTERNAL pHeapInt = Heap;
+
+    pHeapInt = Heap;
     AssertPtrReturn(pHeapInt, 0);
     ASSERT_ANCHOR(pHeapInt);
@@ -862 +881 @@
 RTDECL(size_t) RTHeapSimpleGetFreeSize(RTHEAPSIMPLE Heap)
 {
+    PRTHEAPSIMPLEINTERNAL pHeapInt;
+
     if (Heap == NIL_RTHEAPSIMPLE)
         return 0;
-    PRTHEAPSIMPLEINTERNAL pHeapInt = Heap;
+
+    pHeapInt = Heap;
     AssertPtrReturn(pHeapInt, 0);
     ASSERT_ANCHOR(pHeapInt);
@@ -880 +902 @@
 {
     PRTHEAPSIMPLEINTERNAL pHeapInt = (PRTHEAPSIMPLEINTERNAL)Heap;
+    PRTHEAPSIMPLEFREE pBlock;
+
     pfnPrintf("**** Dumping Heap %p - cbHeap=%zx cbFree=%zx ****\n",
               Heap, pHeapInt->cbHeap, pHeapInt->cbFree);
 
-    PRTHEAPSIMPLEFREE pBlock;
     for (pBlock = (PRTHEAPSIMPLEFREE)(pHeapInt + 1);
          pBlock;