Update to NSPR 4.10.4.

nspr/pr/src/threads/combined/prulock.c

 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "primpl.h"
 
 #if defined(WIN95)
 /*
 ** Some local variables report warnings on Win95 because the code paths 
@@ skipping 142 matching lines @@
 
 
 PR_IMPLEMENT(PRLock*) PR_NewLock(void)
 {
     PRLock *lock;
 
     if (!_pr_initialized) _PR_ImplicitInitialization();
 
     lock = PR_NEWZAP(PRLock);
     if (lock) {
-        if (_PR_MD_NEW_LOCK(&lock->ilock) == PR_FAILURE) {
-                PR_DELETE(lock);
-                return(NULL);
-        }
-        PR_INIT_CLIST(&lock->links);
-        PR_INIT_CLIST(&lock->waitQ);
+        if (_PR_InitLock(lock) != PR_SUCCESS) {
+            PR_DELETE(lock);
+            return NULL;
+        }
     }
     return lock;
 }
 
+PRStatus _PR_InitLock(PRLock *lock)
+{
+    if (_PR_MD_NEW_LOCK(&lock->ilock) != PR_SUCCESS) {
+        return PR_FAILURE;
+    }
+    PR_INIT_CLIST(&lock->links);
+    PR_INIT_CLIST(&lock->waitQ);
+    return PR_SUCCESS;
+}
+
 /*
 ** Destroy the given lock "lock". There is no point in making this race
 ** free because if some other thread has the pointer to this lock all
 ** bets are off.
 */
 PR_IMPLEMENT(void) PR_DestroyLock(PRLock *lock)
 {
+    _PR_FreeLock(lock);
+    PR_DELETE(lock);
+}
+
+void _PR_FreeLock(PRLock *lock)
+{
     PR_ASSERT(lock->owner == 0);
-        _PR_MD_FREE_LOCK(&lock->ilock);
-    PR_DELETE(lock);
+    _PR_MD_FREE_LOCK(&lock->ilock);
 }
 
 extern PRThread *suspendAllThread;
 /*
 ** Lock the lock.
 */
 PR_IMPLEMENT(void) PR_Lock(PRLock *lock)
 {
     PRThread *me = _PR_MD_CURRENT_THREAD();
     PRIntn is;
@@ skipping 231 matching lines @@
 #endif  /* _PR_GLOBAL_THREADS_ONLY */
 }
 
 /************************************************************************/
 /************************************************************************/
 /***********************ROUTINES FOR DCE EMULATION***********************/
 /************************************************************************/
 /************************************************************************/
 PR_IMPLEMENT(PRStatus) PRP_TryLock(PRLock *lock)
     { return (PR_TestAndLock(lock)) ? PR_SUCCESS : PR_FAILURE; }