Changeset 49491 in vbox

Timestamp:

Nov 15, 2013 10:11:42 AM (11 years ago)

Author:

vboxsync

Message:

libs/xpcom: fixed a bunch of pointer size vs. integer size warnings

Location:

trunk/src/libs/xpcom18a4

Files:

• nsprpub/pr/src/misc/prnetdb.c (modified) (1 diff)
• xpcom/ds/nsCheapSets.h (modified) (1 diff)
• xpcom/ds/pldhash.c (modified) (1 diff)
• xpcom/io/nsFastLoadService.cpp (modified) (2 diffs)
• xpcom/tests/TestThreads.cpp (modified) (1 diff)
• xpcom/typelib/xpt/src/xpt_xdr.c (modified) (6 diffs)

trunk/src/libs/xpcom18a4/nsprpub/pr/src/misc/prnetdb.c

@@ -2136 +2136 @@
     if (!_pr_ipv6_is_present) {
         /* using PRAddrInfoFB */
-        PRIntn iter = (PRIntn) iterPtr;
+        PRIntn iter = (PRIntn)(uintptr_t)iterPtr;
         iter = PR_EnumerateHostEnt(iter, &((PRAddrInfoFB *) base)->hostent, port, result);
         if (iter < 0)
             iter = 0;
-        return (void *) iter;
+        return (void *)(uintptr_t)iter;
     }
 #endif

trunk/src/libs/xpcom18a4/xpcom/ds/nsCheapSets.h

@@ -176 +176 @@
   void SetInt(PRInt32 aInt)
   {
-    mValOrHash = (void*)((aInt << 1) | 0x1);
+    mValOrHash = (void*)(uintptr_t)((aInt << 1) | 0x1);
   }
   /** Create the hash and initialize */

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

@@ -104 +104 @@
 PL_DHashVoidPtrKeyStub(PLDHashTable *table, const void *key)
 {
-    return (PLDHashNumber)key >> 2;
+    return (PLDHashNumber)(uintptr_t)key >> 2;
 }
 

trunk/src/libs/xpcom18a4/xpcom/io/nsFastLoadService.cpp

@@ -398 +398 @@
     mChecksumTable.Put(&key, NS_INT32_TO_PTR(checksum));
 #else /* VBOX */
-    mChecksumTable.Put(&key, (void *)checksum);
+    mChecksumTable.Put(&key, (void *)(uintptr_t)checksum);
 #endif /* VBOX */
     *aChecksum = checksum;
@@ -425 +425 @@
     mChecksumTable.Put(&key, NS_INT32_TO_PTR(checksum));
 #else /* VBOX */
-    mChecksumTable.Put(&key, (void *)checksum);
+    mChecksumTable.Put(&key, (void *)(uintptr_t)checksum);
 #endif /* VBOX */
     return NS_OK;

trunk/src/libs/xpcom18a4/xpcom/tests/TestThreads.cpp

@@ -216 +216 @@
         for (k = 0; k < threads; k++) {
             array[k] = PR_CreateThread(PR_USER_THREAD,
-                                       threadProc, (void*) k,
+                                       threadProc, (void*)(uintptr_t)k,
                                        PR_PRIORITY_NORMAL,
                                        PR_GLOBAL_THREAD,

trunk/src/libs/xpcom18a4/xpcom/typelib/xpt/src/xpt_xdr.c

@@ -144 +144 @@
 XPT_HashTableAdd(XPTHashTable *table, void *key, void *value) {
     XPTHashRecord **bucketloc = table->buckets +
-        (((PRUint32)key) % XPT_HASHSIZE);
+        (((PRUint32)(uintptr_t)key) % XPT_HASHSIZE);
     XPTHashRecord *bucket;
 
@@ -160 +160 @@
 static void *
 XPT_HashTableLookup(XPTHashTable *table, void *key) {
-    XPTHashRecord *bucket = table->buckets[(PRUint32)key % XPT_HASHSIZE];
+    XPTHashRecord *bucket = table->buckets[(PRUint32)(uintptr_t)key % XPT_HASHSIZE];
     while (bucket != NULL) {
         if (bucket->key == key)
@@ -484 +484 @@
 XPT_GetOffsetForAddr(XPTCursor *cursor, void *addr)
 {
-    return (PRUint32)XPT_HashTableLookup(cursor->state->pool->offset_map, addr);
+    return (PRUint32)(uintptr_t)XPT_HashTableLookup(cursor->state->pool->offset_map, addr);
 }
 
@@ -491 +491 @@
 {
     return XPT_HashTableAdd(cursor->state->pool->offset_map,
-                            addr, (void *)offset) != NULL;
+                            addr, (void *)(uintptr_t)offset) != NULL;
 }
 
@@ -498 +498 @@
 {
     return XPT_HashTableAdd(cursor->state->pool->offset_map,
-                            (void *)offset, addr) != NULL;
+                            (void *)(uintptr_t)offset, addr) != NULL;
 }
 
@@ -504 +504 @@
 XPT_GetAddrForOffset(XPTCursor *cursor, PRUint32 offset)
 {
-    return XPT_HashTableLookup(cursor->state->pool->offset_map, (void *)offset);
+    return XPT_HashTableLookup(cursor->state->pool->offset_map, (void *)(uintptr_t)offset);
 }