Index: nss/mozilla/security/nss/lib/pk11wrap/pk11load.c |
=================================================================== |
--- nss/mozilla/security/nss/lib/pk11wrap/pk11load.c (revision 55475) |
+++ nss/mozilla/security/nss/lib/pk11wrap/pk11load.c (working copy) |
@@ -139,9 +139,9 @@ |
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; |
@@ -424,7 +424,7 @@ |
PR_SUCCESS != PR_CallOnce(&loadSoftokenOnce, &softoken_LoadDSO)) |
return SECFailure; |
- PR_AtomicIncrement(&softokenLoadCount); |
+ PR_ATOMIC_INCREMENT(&softokenLoadCount); |
if (mod->isFIPS) { |
entry = (CK_C_GetFunctionList) |
@@ -612,7 +612,7 @@ |
* 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) { |