Changeset 588 for GPL/branches/uniaud32-2.1.x/lib32/malloc.c

Timestamp:

Feb 10, 2017, 2:50:49 AM (9 years ago)

Author:

David Azarewicz

Message:

Build system cleanup

File:

• GPL/branches/uniaud32-2.1.x/lib32/malloc.c (moved) (moved from GPL/branches/uniaud32-2.1.x/lib32/malloc.cpp ) (4 diffs)

GPL/branches/uniaud32-2.1.x/lib32/malloc.c

@@ -384 +384 @@
 physically located after pmb.
 
-Helper function remove() removes an element from the free list.
+Helper function h_remove() removes an element from the free list.
 */
 
 #define after(pmb) ((PMEMBLOCK) ((char *) pmb + pmb->ulSize + HDR_SIZE))
 
-void remove(PMEMBLOCK pmb)
+void h_remove(PMEMBLOCK pmb)
 {
     PMEMBLOCK pmbPrev;
 
-    if (pmb == pmbFree) {
+    if (pmb == pmbFree)
+    {
         pmbFree = pmbFree->pmbNext;
         return;
     }
 
-    for (pmbPrev=pmbFree; pmbPrev; pmbPrev=pmbPrev->pmbNext) {
-        if (pmbPrev->pmbNext == pmb) {
+    for (pmbPrev=pmbFree; pmbPrev; pmbPrev=pmbPrev->pmbNext)
+    {
+        if (pmbPrev->pmbNext == pmb)
+        {
             pmbPrev->pmbNext = pmb->pmbNext;
             return;
@@ -405 +408 @@
         }
 }
-//*****************************************************************************
+
 //*****************************************************************************
 void compact(void)
@@ -417 +420 @@
                         // dprintf(("HEAP: compact found pointer %p (size=%ui) before pmbFree %p\n", (void __far *) pmb, pmb->uSize, (void __far *) pmbFree));
             pmb->ulSize += HDR_SIZE + pmbFree->ulSize;
-            remove(pmbFree);
+            h_remove(pmbFree);
             if (++sFreed == 2) break;
         } else if (after(pmbFree) == pmb) {
                         // dprintf(("HEAP: compact found pointer %p (size=%ui) after pmbFree %p\n", (void __far *) pmb, pmb->uSize, (void __far *) pmbFree);
             pmbFree->ulSize += HDR_SIZE + pmb->ulSize;
-            remove(pmb);
+            h_remove(pmb);
             if (++sFreed == 2) break;
         }
@@ -554 +557 @@
 }
 //*****************************************************************************
-extern "C" APIRET VMAlloc(ULONG size, ULONG flags, LINEAR *pAddr) ;
+extern APIRET VMAlloc(ULONG size, ULONG flags, LINEAR *pAddr) ;
 //*****************************************************************************
 ULONG HeapInit(ULONG ulSize)