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

Timestamp:

Mar 31, 2009 8:36:22 AM (16 years ago)

Author:

vboxsync

Message:

Warnings: move assertion statements for parameters past initial declarations to silence -Wdeclaration-after-statement.
Correct some typos in comments.

File:

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

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

@@ -83 +83 @@
 /** The magic value. */
 #define RTHEAPSIMPLEBLOCK_FLAGS_MAGIC       ((uintptr_t)0xabcdef00)
-/** The mask that needs to be applied to RTHEAPSIMPLEBLOCK::fFalgs to obtain the magic value. */
+/** The mask that needs to be applied to RTHEAPSIMPLEBLOCK::fFlags to obtain the magic value. */
 #define RTHEAPSIMPLEBLOCK_FLAGS_MAGIC_MASK  (~(uintptr_t)RT_BIT(0))
 
@@ -301 +301 @@
 
     /*
-     * Validate input. The imposed minimum heap size is just a convenien value.
+     * Validate input. The imposed minimum heap size is just a convenient value.
      */
     AssertReturn(cbMemory >= PAGE_SIZE, VERR_INVALID_PARAMETER);
@@ -450 +450 @@
  * Allocates a block of memory from the specified heap.
  *
- * No parameter validation or adjustment is preformed.
+ * No parameter validation or adjustment is performed.
  *
  * @returns Pointer to the allocated block.
@@ -460 +460 @@
 static PRTHEAPSIMPLEBLOCK rtHeapSimpleAllocBlock(PRTHEAPSIMPLEINTERNAL pHeapInt, size_t cb, size_t uAlignment)
 {
+    /*
+     * Search for a fitting block from the lower end of the heap.
+     */
+    PRTHEAPSIMPLEBLOCK  pRet = NULL;
+    PRTHEAPSIMPLEFREE   pFree;
 #ifdef RTHEAPSIMPLE_STRICT
     rtHeapSimpleAssertAll(pHeapInt);
 #endif
 
-    /*
-     * Search for a fitting block from the lower end of the heap.
-     */
-    PRTHEAPSIMPLEBLOCK  pRet = NULL;
-    PRTHEAPSIMPLEFREE   pFree;
     for (pFree = pHeapInt->pFreeHead;
          pFree;
@@ -524 +524 @@
 
             /*
-             * Recreate pFree in the new position and adjust the neighbours.
+             * Recreate pFree in the new position and adjust the neighbors.
              */
             *pFree = Free;
@@ -667 +667 @@
 
 /**
- * Free memory a memory block.
+ * Free a memory block.
  *
  * @param   pHeapInt       The heap.
@@ -676 +676 @@
     PRTHEAPSIMPLEFREE   pFree = (PRTHEAPSIMPLEFREE)pBlock;
 
+    /*
+     * Look for the closest free list blocks by walking the blocks right
+     * of us (both lists are sorted by address).
+     */
+    PRTHEAPSIMPLEFREE   pLeft = NULL;
+    PRTHEAPSIMPLEFREE   pRight = NULL;
 #ifdef RTHEAPSIMPLE_STRICT
     rtHeapSimpleAssertAll(pHeapInt);
 #endif
 
-    /*
-     * Look for the closest free list blocks by walking the blocks right
-     * of us (both list are sorted on address).
-     */
-    PRTHEAPSIMPLEFREE   pLeft = NULL;
-    PRTHEAPSIMPLEFREE   pRight = NULL;
     if (pHeapInt->pFreeTail)
     {
@@ -789 +789 @@
 #ifdef RTHEAPSIMPLE_STRICT
 /**
- * Internal consitency check (relying on assertions).
+ * Internal consistency check (relying on assertions).
  * @param   pHeapInt
  */