Changeset 101997 in vbox for trunk/src

Timestamp:

Nov 8, 2023 5:57:57 PM (16 months ago)

Author:

vboxsync

Message:

libs/xpcom/xpcom: Convert from PR_ASSERT to IPRT assertions, bugref:10545

Location:

trunk/src/libs/xpcom18a4/xpcom/ds

Files:

• nsHashtable.cpp (modified) (3 diffs)
• pldhash.c (modified) (11 diffs)

trunk/src/libs/xpcom18a4/xpcom/ds/nsHashtable.cpp

@@ -49 +49 @@
 #include <string.h>
 #include "prmem.h"
-#include "prlog.h"
 #include "nsHashtable.h"
 #include "nsReadableUtils.h"
@@ -221 +220 @@
 
     // shouldn't be adding an item during enumeration
-    PR_ASSERT(!mEnumerating);
+    Assert(!mEnumerating);
     
     HTEntry* entry =
@@ -267 +266 @@
 
     // shouldn't be adding an item during enumeration
-    PR_ASSERT(!mEnumerating);
+    Assert(!mEnumerating);
 
 

trunk/src/libs/xpcom18a4/xpcom/ds/pldhash.c

@@ -47 +47 @@
 #include "prbit.h"
 #include "pldhash.h"
-#include "prlog.h"     /* for PR_ASSERT */
 
 #ifdef PL_DHASHMETER
@@ -58 +57 @@
 #endif
 #ifdef VBOX_USE_IPRT_IN_XPCOM
+# include <iprt/assert.h>
 # include <iprt/mem.h>
 #endif
@@ -273 +273 @@
      * buggy caller intended.
      */
-    PR_ASSERT(0.5 <= maxAlpha && maxAlpha < 1 && 0 <= minAlpha);
+    Assert(0.5 <= maxAlpha && maxAlpha < 1 && 0 <= minAlpha);
     if (maxAlpha < 0.5 || 1 <= maxAlpha || minAlpha < 0)
         return;
@@ -282 +282 @@
      * size and the precision limit of maxAlphaFrac's fixed point format.
      */
-    PR_ASSERT(PL_DHASH_MIN_SIZE - (maxAlpha * PL_DHASH_MIN_SIZE) >= 1);
+    Assert(PL_DHASH_MIN_SIZE - (maxAlpha * PL_DHASH_MIN_SIZE) >= 1);
     if (PL_DHASH_MIN_SIZE - (maxAlpha * PL_DHASH_MIN_SIZE) < 1) {
         maxAlpha = (float)
@@ -294 +294 @@
      * (8-bit fixed point format).
      */
-    PR_ASSERT(minAlpha < maxAlpha / 2);
+    Assert(minAlpha < maxAlpha / 2);
     if (minAlpha >= maxAlpha / 2) {
         size = PL_DHASH_TABLE_SIZE(table);
@@ -388 +388 @@
 
     METER(table->stats.searches++);
-    PR_ASSERT(!(keyHash & COLLISION_FLAG));
+    Assert(!(keyHash & COLLISION_FLAG));
 
     /* Compute the primary hash address. */
@@ -464 +464 @@
 
 #ifdef VBOX /* HACK ALERT! generation == PR_UINT32_MAX during enumeration. */
-    PR_ASSERT(table->generation != PR_UINT32_MAX);
+    Assert(table->generation != PR_UINT32_MAX);
     if (table->generation == PR_UINT32_MAX)
         return PR_FALSE;
@@ -506 +506 @@
             newEntry = SearchTable(table, getKey(table, oldEntry),
                                    oldEntry->keyHash, PL_DHASH_ADD);
-            PR_ASSERT(PL_DHASH_ENTRY_IS_FREE(newEntry));
+            Assert(PL_DHASH_ENTRY_IS_FREE(newEntry));
             moveEntry(table, oldEntry, newEntry);
             newEntry->keyHash = oldEntry->keyHash;
@@ -615 +615 @@
 
       default:
-        PR_ASSERT(0);
+        AssertFailed();
         entry = NULL;
     }
@@ -627 +627 @@
     PLDHashNumber keyHash;      /* load first in case clearEntry goofs it */
 
-    PR_ASSERT(PL_DHASH_ENTRY_IS_LIVE(entry));
+    Assert(PL_DHASH_ENTRY_IS_LIVE(entry));
     keyHash = entry->keyHash;
     table->ops->clearEntry(table, entry);
@@ -675 +675 @@
             op = etor(table, entry, i++, arg);
 #ifdef VBOX /* HACK ALERT! generation == PR_UINT32_MAX during enumeration. */
-            PR_ASSERT(table->generation == PR_UINT32_MAX);
+            Assert(table->generation == PR_UINT32_MAX);
 #endif
             if (op & PL_DHASH_REMOVE) {