Update to NSS 3.12.7 and NSPR 4.8.6....

nss/mozilla/security/nss/lib/pk11wrap/pk11load.c

 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
  *
  * Software distributed under the License is distributed on an "AS IS" basis,
  * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
@@ skipping 121 matching lines @@
  * initialize.
  */
 static SECStatus
 secmod_handleReload(SECMODModule *oldModule, SECMODModule *newModule)
 {
     PK11SlotInfo *slot;
     char *modulespec;
     char *newModuleSpec;
     char **children;
     CK_SLOT_ID *ids;
-    SECStatus rv;
-    SECMODConfigList *conflist;
-    int count = 0;
+    SECMODConfigList *conflist = NULL;
+    SECStatus         rv       = SECFailure;
+    int               count    = 0;
 
     /* first look for tokens= key words from the module spec */
     modulespec = newModule->libraryParams;
     newModuleSpec = secmod_ParseModuleSpecForTokens(PR_TRUE,
                                 newModule->isFIPS, modulespec, &children, &ids);
     if (!newModuleSpec) {
         return SECFailure;
     }
 
     /* 
@@ skipping 262 matching lines @@
     }
 #else
     /*
      * Loads softoken as a dynamic library,
      * even though the rest of NSS assumes this as the "internal" module.
      */
     if (!softokenLib && 
         PR_SUCCESS != PR_CallOnce(&loadSoftokenOnce, &softoken_LoadDSO))
         return SECFailure;
 
-    PR_AtomicIncrement(&softokenLoadCount);
+    PR_ATOMIC_INCREMENT(&softokenLoadCount);
 
     if (mod->isFIPS) {
         entry = (CK_C_GetFunctionList) 
                     PR_FindSymbol(softokenLib, "FC_GetFunctionList");
     } else {
         entry = (CK_C_GetFunctionList) 
                     PR_FindSymbol(softokenLib, "NSC_GetFunctionList");
     }
 
     if (!entry)
@@ skipping 167 matching lines @@
         }
     }
     mod->moduleID = 0;
     mod->loaded = PR_FALSE;
     
     /* do we want the semantics to allow unloading the internal library?
      * if not, we should change this to SECFailure and move it above the
      * mod->loaded = PR_FALSE; */
     if (mod->internal) {
 #if 0  /* STATIC LIBRARIES */
-        if (0 == PR_AtomicDecrement(&softokenLoadCount)) {
+        if (0 == PR_ATOMIC_DECREMENT(&softokenLoadCount)) {
           if (softokenLib) {
               disableUnload = PR_GetEnv("NSS_DISABLE_UNLOAD");
               if (!disableUnload) {
                   PRStatus status = PR_UnloadLibrary(softokenLib);
                   PORT_Assert(PR_SUCCESS == status);
               }
               softokenLib = NULL;
           }
           loadSoftokenOnce = pristineCallOnce;
         }
@@ skipping 16 matching lines @@
 
 void
 nss_DumpModuleLog(void)
 {
 #ifdef DEBUG_MODULE
     if (modToDBG) {
         print_final_statistics();
     }
 #endif
 }