Update to NSS 3.12.7 and NSPR 4.8.6....

nss/mozilla/security/nss/lib/dev/devtoken.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 17 matching lines @@
  * under the terms of either the GPL or the LGPL, and not to allow others to
  * use your version of this file under the terms of the MPL, indicate your
  * decision by deleting the provisions above and replace them with the notice
  * and other provisions required by the GPL or the LGPL. If you do not delete
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
 #ifdef DEBUG
-static const char CVS_ID[] = "@(#) $RCSfile: devtoken.c,v $ $Revision: 1.53 $ $Date: 2010/01/08 02:00:58 $";
+static const char CVS_ID[] = "@(#) $RCSfile: devtoken.c,v $ $Revision: 1.54 $ $Date: 2010/04/03 18:27:30 $";
 #endif /* DEBUG */
 
 #include "pkcs11.h"
 
 #ifndef DEVM_H
 #include "devm.h"
 #endif /* DEVM_H */
 
 #ifndef CKHELPER_H
 #include "ckhelper.h"
 #endif /* CKHELPER_H */
 
 #include "pk11func.h"
 #include "dev3hack.h"
 #include "secerr.h"
 
 extern const NSSError NSS_ERROR_NOT_FOUND;
 extern const NSSError NSS_ERROR_INVALID_ARGUMENT;
 extern const NSSError NSS_ERROR_PKCS11;
 
 /* The number of object handles to grab during each call to C_FindObjects */
 #define OBJECT_STACK_SIZE 16
 
 NSS_IMPLEMENT PRStatus
 nssToken_Destroy (
   NSSToken *tok
 )
 {
     if (tok) {
-        if (PR_AtomicDecrement(&tok->base.refCount) == 0) {
+        if (PR_ATOMIC_DECREMENT(&tok->base.refCount) == 0) {
             PZ_DestroyLock(tok->base.lock);
             nssTokenObjectCache_Destroy(tok->cache);
             /* The token holds the first/last reference to the slot.
              * When the token is actually destroyed, that ref must go too.
              */
             (void)nssSlot_Destroy(tok->slot);
             return nssArena_Destroy(tok->base.arena);
         }
     }
     return PR_SUCCESS;
@@ skipping 13 matching lines @@
 )
 {
     (void)nssToken_Destroy(tok);
 }
 
 NSS_IMPLEMENT NSSToken *
 nssToken_AddRef (
   NSSToken *tok
 )
 {
-    PR_AtomicIncrement(&tok->base.refCount);
+    PR_ATOMIC_INCREMENT(&tok->base.refCount);
     return tok;
 }
 
 NSS_IMPLEMENT NSSSlot *
 nssToken_GetSlot (
   NSSToken *tok
 )
 {
     return nssSlot_AddRef(tok->slot);
 }
@@ skipping 1496 matching lines @@
     theClass = CKO_PRIVATE_KEY;
     if (!nssSlot_IsLoggedIn(token->slot)) {
         theClass = CKO_PUBLIC_KEY;
     }
     if (PK11_MatchItem(token->pk11slot, instance->handle, theClass) 
                                                 != CK_INVALID_HANDLE) {
         return PR_TRUE;
     }
     return PR_FALSE;
 }