Issue #1338 - Part 1: Update NSPR to 4.24

1 files changed, 110 insertions, 105 deletions

diff --git a/nsprpub/pr/src/misc/pratom.c b/nsprpub/pr/src/misc/pratom.c
index 65e6f3cd8..4f0e3da30 100644
--- a/nsprpub/pr/src/misc/pratom.c
+++ b/nsprpub/pr/src/misc/pratom.c
@@ -43,91 +43,94 @@
 /*
  * lock counts should be a power of 2
  */
-#define DEFAULT_ATOMIC_LOCKS	16	/* should be in sync with the number of initializers
-										below */
-#define MAX_ATOMIC_LOCKS		(4 * 1024)
+#define DEFAULT_ATOMIC_LOCKS    16  /* should be in sync with the number of initializers
+                                        below */
+#define MAX_ATOMIC_LOCKS        (4 * 1024)
 
 static pthread_mutex_t static_atomic_locks[DEFAULT_ATOMIC_LOCKS] = {
-        PTHREAD_MUTEX_INITIALIZER, PTHREAD_MUTEX_INITIALIZER,
-        PTHREAD_MUTEX_INITIALIZER, PTHREAD_MUTEX_INITIALIZER,
-        PTHREAD_MUTEX_INITIALIZER, PTHREAD_MUTEX_INITIALIZER,
-        PTHREAD_MUTEX_INITIALIZER, PTHREAD_MUTEX_INITIALIZER,
-        PTHREAD_MUTEX_INITIALIZER, PTHREAD_MUTEX_INITIALIZER,
-        PTHREAD_MUTEX_INITIALIZER, PTHREAD_MUTEX_INITIALIZER,
-        PTHREAD_MUTEX_INITIALIZER, PTHREAD_MUTEX_INITIALIZER,
-        PTHREAD_MUTEX_INITIALIZER, PTHREAD_MUTEX_INITIALIZER };
+    PTHREAD_MUTEX_INITIALIZER, PTHREAD_MUTEX_INITIALIZER,
+    PTHREAD_MUTEX_INITIALIZER, PTHREAD_MUTEX_INITIALIZER,
+    PTHREAD_MUTEX_INITIALIZER, PTHREAD_MUTEX_INITIALIZER,
+    PTHREAD_MUTEX_INITIALIZER, PTHREAD_MUTEX_INITIALIZER,
+    PTHREAD_MUTEX_INITIALIZER, PTHREAD_MUTEX_INITIALIZER,
+    PTHREAD_MUTEX_INITIALIZER, PTHREAD_MUTEX_INITIALIZER,
+    PTHREAD_MUTEX_INITIALIZER, PTHREAD_MUTEX_INITIALIZER,
+    PTHREAD_MUTEX_INITIALIZER, PTHREAD_MUTEX_INITIALIZER
+};
 
 #ifdef DEBUG
 static PRInt32 static_hash_lock_counts[DEFAULT_ATOMIC_LOCKS];
 static PRInt32 *hash_lock_counts = static_hash_lock_counts;
 #endif
 
-static PRUint32	num_atomic_locks = DEFAULT_ATOMIC_LOCKS;
+static PRUint32 num_atomic_locks = DEFAULT_ATOMIC_LOCKS;
 static pthread_mutex_t *atomic_locks = static_atomic_locks;
 static PRUint32 atomic_hash_mask = DEFAULT_ATOMIC_LOCKS - 1;
 
-#define _PR_HASH_FOR_LOCK(ptr) 							\
-			((PRUint32) (((PRUptrdiff) (ptr) >> 2)	^	\
-						((PRUptrdiff) (ptr) >> 8)) &	\
-						atomic_hash_mask)
+#define _PR_HASH_FOR_LOCK(ptr)                          \
+            ((PRUint32) (((PRUptrdiff) (ptr) >> 2)  ^   \
+                        ((PRUptrdiff) (ptr) >> 8)) &    \
+                        atomic_hash_mask)
 
 void _PR_MD_INIT_ATOMIC()
 {
-char *eval;
-int index;
-
-
-	PR_ASSERT(PR_FloorLog2(MAX_ATOMIC_LOCKS) ==
-						PR_CeilingLog2(MAX_ATOMIC_LOCKS));
-
-	PR_ASSERT(PR_FloorLog2(DEFAULT_ATOMIC_LOCKS) ==
-							PR_CeilingLog2(DEFAULT_ATOMIC_LOCKS));
-
-	if (((eval = getenv("NSPR_ATOMIC_HASH_LOCKS")) != NULL)  &&
-		((num_atomic_locks = atoi(eval)) != DEFAULT_ATOMIC_LOCKS)) {
-
-		if (num_atomic_locks > MAX_ATOMIC_LOCKS)
-			num_atomic_locks = MAX_ATOMIC_LOCKS;
-		else if (num_atomic_locks < 1) 
-			num_atomic_locks = 1;
-		else {
-			num_atomic_locks = PR_FloorLog2(num_atomic_locks);
-			num_atomic_locks = 1L << num_atomic_locks;
-		}
-		atomic_locks = (pthread_mutex_t *) PR_Malloc(sizeof(pthread_mutex_t) *
-						num_atomic_locks);
-		if (atomic_locks) {
-			for (index = 0; index < num_atomic_locks; index++) {
-				if (pthread_mutex_init(&atomic_locks[index], NULL)) {
-						PR_DELETE(atomic_locks);
-						atomic_locks = NULL;
-						break; 
-				}
-			}
-		}
+    char *eval;
+    int index;
+
+
+    PR_ASSERT(PR_FloorLog2(MAX_ATOMIC_LOCKS) ==
+              PR_CeilingLog2(MAX_ATOMIC_LOCKS));
+
+    PR_ASSERT(PR_FloorLog2(DEFAULT_ATOMIC_LOCKS) ==
+              PR_CeilingLog2(DEFAULT_ATOMIC_LOCKS));
+
+    if (((eval = getenv("NSPR_ATOMIC_HASH_LOCKS")) != NULL)  &&
+        ((num_atomic_locks = atoi(eval)) != DEFAULT_ATOMIC_LOCKS)) {
+
+        if (num_atomic_locks > MAX_ATOMIC_LOCKS) {
+            num_atomic_locks = MAX_ATOMIC_LOCKS;
+        }
+        else if (num_atomic_locks < 1) {
+            num_atomic_locks = 1;
+        }
+        else {
+            num_atomic_locks = PR_FloorLog2(num_atomic_locks);
+            num_atomic_locks = 1L << num_atomic_locks;
+        }
+        atomic_locks = (pthread_mutex_t *) PR_Malloc(sizeof(pthread_mutex_t) *
+                       num_atomic_locks);
+        if (atomic_locks) {
+            for (index = 0; index < num_atomic_locks; index++) {
+                if (pthread_mutex_init(&atomic_locks[index], NULL)) {
+                    PR_DELETE(atomic_locks);
+                    atomic_locks = NULL;
+                    break;
+                }
+            }
+        }
 #ifdef DEBUG
-		if (atomic_locks) {
-			hash_lock_counts = PR_CALLOC(num_atomic_locks * sizeof(PRInt32));
-			if (hash_lock_counts == NULL) {
-				PR_DELETE(atomic_locks);
-				atomic_locks = NULL;
-			}
-		}
+        if (atomic_locks) {
+            hash_lock_counts = PR_CALLOC(num_atomic_locks * sizeof(PRInt32));
+            if (hash_lock_counts == NULL) {
+                PR_DELETE(atomic_locks);
+                atomic_locks = NULL;
+            }
+        }
 #endif
-		if (atomic_locks == NULL) {
-			/*
-			 *	Use statically allocated locks
-			 */
-			atomic_locks = static_atomic_locks;
-			num_atomic_locks = DEFAULT_ATOMIC_LOCKS;
-	#ifdef DEBUG
-			hash_lock_counts = static_hash_lock_counts;
-	#endif
-		}
-		atomic_hash_mask = num_atomic_locks - 1;
-	}
-	PR_ASSERT(PR_FloorLog2(num_atomic_locks) ==
-								PR_CeilingLog2(num_atomic_locks));
+        if (atomic_locks == NULL) {
+            /*
+             *  Use statically allocated locks
+             */
+            atomic_locks = static_atomic_locks;
+            num_atomic_locks = DEFAULT_ATOMIC_LOCKS;
+#ifdef DEBUG
+            hash_lock_counts = static_hash_lock_counts;
+#endif
+        }
+        atomic_hash_mask = num_atomic_locks - 1;
+    }
+    PR_ASSERT(PR_FloorLog2(num_atomic_locks) ==
+              PR_CeilingLog2(num_atomic_locks));
 }
 
 PRInt32
@@ -299,55 +302,57 @@ PR_AtomicAdd(PRInt32 *ptr, PRInt32 val)
 PR_IMPLEMENT(PRStack *)
 PR_CreateStack(const char *stack_name)
 {
-PRStack *stack;
+    PRStack *stack;
 
     if (!_pr_initialized) {
         _PR_ImplicitInitialization();
     }
 
     if ((stack = PR_NEW(PRStack)) == NULL) {
-		return NULL;
-	}
-	if (stack_name) {
-		stack->prstk_name = (char *) PR_Malloc(strlen(stack_name) + 1);
-		if (stack->prstk_name == NULL) {
-			PR_DELETE(stack);
-			return NULL;
-		}
-		strcpy(stack->prstk_name, stack_name);
-	} else
-		stack->prstk_name = NULL;
+        return NULL;
+    }
+    if (stack_name) {
+        stack->prstk_name = (char *) PR_Malloc(strlen(stack_name) + 1);
+        if (stack->prstk_name == NULL) {
+            PR_DELETE(stack);
+            return NULL;
+        }
+        strcpy(stack->prstk_name, stack_name);
+    } else {
+        stack->prstk_name = NULL;
+    }
 
 #ifndef _PR_HAVE_ATOMIC_CAS
     stack->prstk_lock = PR_NewLock();
-	if (stack->prstk_lock == NULL) {
-		PR_Free(stack->prstk_name);
-		PR_DELETE(stack);
-		return NULL;
-	}
+    if (stack->prstk_lock == NULL) {
+        PR_Free(stack->prstk_name);
+        PR_DELETE(stack);
+        return NULL;
+    }
 #endif /* !_PR_HAVE_ATOMIC_CAS */
 
-	stack->prstk_head.prstk_elem_next = NULL;
-	
+    stack->prstk_head.prstk_elem_next = NULL;
+
     return stack;
 }
 
 PR_IMPLEMENT(PRStatus)
 PR_DestroyStack(PRStack *stack)
 {
-	if (stack->prstk_head.prstk_elem_next != NULL) {
-		PR_SetError(PR_INVALID_STATE_ERROR, 0);
-		return PR_FAILURE;
-	}
+    if (stack->prstk_head.prstk_elem_next != NULL) {
+        PR_SetError(PR_INVALID_STATE_ERROR, 0);
+        return PR_FAILURE;
+    }
 
-	if (stack->prstk_name)
-		PR_Free(stack->prstk_name);
+    if (stack->prstk_name) {
+        PR_Free(stack->prstk_name);
+    }
 #ifndef _PR_HAVE_ATOMIC_CAS
-	PR_DestroyLock(stack->prstk_lock);
+    PR_DestroyLock(stack->prstk_lock);
 #endif /* !_PR_HAVE_ATOMIC_CAS */
-	PR_DELETE(stack);
+    PR_DELETE(stack);
 
-	return PR_SUCCESS;
+    return PR_SUCCESS;
 }
 
 #ifndef _PR_HAVE_ATOMIC_CAS
@@ -356,8 +361,8 @@ PR_IMPLEMENT(void)
 PR_StackPush(PRStack *stack, PRStackElem *stack_elem)
 {
     PR_Lock(stack->prstk_lock);
-	stack_elem->prstk_elem_next = stack->prstk_head.prstk_elem_next;
-	stack->prstk_head.prstk_elem_next = stack_elem;
+    stack_elem->prstk_elem_next = stack->prstk_head.prstk_elem_next;
+    stack->prstk_head.prstk_elem_next = stack_elem;
     PR_Unlock(stack->prstk_lock);
     return;
 }
@@ -365,14 +370,14 @@ PR_StackPush(PRStack *stack, PRStackElem *stack_elem)
 PR_IMPLEMENT(PRStackElem *)
 PR_StackPop(PRStack *stack)
 {
-PRStackElem *element;
+    PRStackElem *element;
 
     PR_Lock(stack->prstk_lock);
-	element = stack->prstk_head.prstk_elem_next;
-	if (element != NULL) {
-		stack->prstk_head.prstk_elem_next = element->prstk_elem_next;
-		element->prstk_elem_next = NULL;	/* debugging aid */
-	}
+    element = stack->prstk_head.prstk_elem_next;
+    if (element != NULL) {
+        stack->prstk_head.prstk_elem_next = element->prstk_elem_next;
+        element->prstk_elem_next = NULL;    /* debugging aid */
+    }
     PR_Unlock(stack->prstk_lock);
     return element;
 }