Changeset 19865 in vbox for trunk/src/VBox/Runtime/common/misc/handletable.cpp

Timestamp:

May 20, 2009 1:33:14 PM (16 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

47538

Message:

IPRT: Made handletable.cpp and handletablectx.cpp build cleanly as C.

File:

• trunk/src/VBox/Runtime/common/misc/handletable.cpp (modified) (9 diffs)

trunk/src/VBox/Runtime/common/misc/handletable.cpp

@@ -48 +48 @@
                                   PFNRTHANDLETABLERETAIN pfnRetain, void *pvUser)
 {
+    PRTHANDLETABLEINT   pThis;
+    uint32_t            cLevel1;
+    size_t              cb;
+
     /*
      * Validate input.
@@ -65 +69 @@
     cMax = ((cMax + RTHT_LEVEL2_ENTRIES - 1) / RTHT_LEVEL2_ENTRIES) * RTHT_LEVEL2_ENTRIES;
 
-    uint32_t const cLevel1 = cMax / RTHT_LEVEL2_ENTRIES;
+    cLevel1 = cMax / RTHT_LEVEL2_ENTRIES;
     Assert(cLevel1 * RTHT_LEVEL2_ENTRIES == cMax);
 
@@ -72 +76 @@
      * if it's below the threshold size.
      */
-    size_t cb = sizeof(RTHANDLETABLEINT);
+    cb = sizeof(RTHANDLETABLEINT);
     if (cLevel1 < RTHT_LEVEL1_DYN_ALLOC_THRESHOLD)
         cb = RT_ALIGN(cb, sizeof(void *)) + cLevel1 * sizeof(void *);
-    PRTHANDLETABLEINT pThis = (PRTHANDLETABLEINT)RTMemAllocZ(cb);
+    pThis = (PRTHANDLETABLEINT)RTMemAllocZ(cb);
     if (!pThis)
         return VERR_NO_MEMORY;
@@ -121 +125 @@
 RTDECL(int) RTHandleTableDestroy(RTHANDLETABLE hHandleTable, PFNRTHANDLETABLEDELETE pfnDelete, void *pvUser)
 {
+    PRTHANDLETABLEINT   pThis;
+    RTSPINLOCKTMP       Tmp;
+    uint32_t            i1;
+    uint32_t            i;
+
     /*
      * Validate input, quitely ignore the NIL handle.
@@ -126 +135 @@
     if (hHandleTable == NIL_RTHANDLETABLE)
         return VINF_SUCCESS;
-    PRTHANDLETABLEINT pThis = (PRTHANDLETABLEINT)hHandleTable;
+    pThis = (PRTHANDLETABLEINT)hHandleTable;
     AssertPtrReturn(pThis, VERR_INVALID_HANDLE);
     AssertReturn(pThis->u32Magic == RTHANDLETABLE_MAGIC, VERR_INVALID_HANDLE);
@@ -135 +144 @@
      * Then kill the lock.
      */
-    RTSPINLOCKTMP Tmp;
     rtHandleTableLock(pThis, &Tmp);
     ASMAtomicWriteU32(&pThis->u32Magic, ~RTHANDLETABLE_MAGIC);
@@ -157 +165 @@
         if (pThis->fFlags & RTHANDLETABLE_FLAGS_CONTEXT)
         {
-            for (uint32_t i1 = 0; cLeft > 0 && i1 < pThis->cLevel1; i1++)
+            for (i1 = 0; cLeft > 0 && i1 < pThis->cLevel1; i1++)
             {
                 PRTHTENTRYCTX paTable = (PRTHTENTRYCTX)pThis->papvLevel1[i1];
                 if (paTable)
-                    for (uint32_t i = 0; i < RTHT_LEVEL2_ENTRIES; i++)
+                    for (i = 0; i < RTHT_LEVEL2_ENTRIES; i++)
                         if (!RTHT_IS_FREE(paTable[i].pvObj))
                         {
@@ -173 +181 @@
         else
         {
-            for (uint32_t i1 = 0; cLeft > 0 && i1 < pThis->cLevel1; i1++)
+            for (i1 = 0; cLeft > 0 && i1 < pThis->cLevel1; i1++)
             {
                 PRTHTENTRY paTable = (PRTHTENTRY)pThis->papvLevel1[i1];
                 if (paTable)
-                    for (uint32_t i = 0; i < RTHT_LEVEL2_ENTRIES; i++)
+                    for (i = 0; i < RTHT_LEVEL2_ENTRIES; i++)
                         if (!RTHT_IS_FREE(paTable[i].pvObj))
                         {
@@ -193 +201 @@
      * Free the memory.
      */
-    for (uint32_t i1 = 0; i1 < pThis->cLevel1; i1++)
+    for (i1 = 0; i1 < pThis->cLevel1; i1++)
         if (pThis->papvLevel1[i1])
         {