Update NSS to 3.21 RTM and NSPR to 4.11 RTM

nss/lib/util/secport.c

 /* 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/. */
 
 /*
  * secport.c - portability interfaces for security libraries
  *
  * This file abstracts out libc functionality that libsec depends on
  * 
  * NOTE - These are not public interfaces
@@ skipping 448 matching lines @@
 }
 
 static void
 port_ArenaRelease(PLArenaPool *arena, void *mark, PRBool zero)
 {
     PORTArenaPool *pool = (PORTArenaPool *)arena;
     if (ARENAPOOL_MAGIC == pool->magic ) {
         PZ_Lock(pool->lock);
 #ifdef THREADMARK
         {
-            threadmark_mark **pw, *tm;
+            threadmark_mark **pw;
 
             if (PR_GetCurrentThread() != pool->marking_thread ) {
                 PZ_Unlock(pool->lock);
                 PORT_SetError(SEC_ERROR_NO_MEMORY);
                 PORT_Assert(0);
                 return /* no error indication available */ ;
             }
 
             pw = &pool->first_mark;
             while( *pw && (mark != (*pw)->mark) ) {
                 pw = &(*pw)->next;
             }
 
             if (! *pw ) {
                 /* bad mark */
                 PZ_Unlock(pool->lock);
                 PORT_SetError(SEC_ERROR_NO_MEMORY);
                 PORT_Assert(0);
                 return /* no error indication available */ ;
             }
 
-            tm = *pw;
             *pw = (threadmark_mark *)NULL;
 
             if (zero) {
                 port_ArenaZeroAfterMark(arena, mark);
             }
             PL_ARENA_RELEASE(arena, mark);
 
             if (! pool->first_mark ) {
                 pool->marking_thread = (PRThread *)NULL;
             }
@@ skipping 27 matching lines @@
 {
     port_ArenaRelease(arena, mark, PR_TRUE);
 }
 
 void
 PORT_ArenaUnmark(PLArenaPool *arena, void *mark)
 {
 #ifdef THREADMARK
     PORTArenaPool *pool = (PORTArenaPool *)arena;
     if (ARENAPOOL_MAGIC == pool->magic ) {
-        threadmark_mark **pw, *tm;
+        threadmark_mark **pw;
 
         PZ_Lock(pool->lock);
 
         if (PR_GetCurrentThread() != pool->marking_thread ) {
             PZ_Unlock(pool->lock);
             PORT_SetError(SEC_ERROR_NO_MEMORY);
             PORT_Assert(0);
             return /* no error indication available */ ;
         }
 
         pw = &pool->first_mark;
         while( ((threadmark_mark *)NULL != *pw) && (mark != (*pw)->mark) ) {
             pw = &(*pw)->next;
         }
 
         if ((threadmark_mark *)NULL == *pw ) {
             /* bad mark */
             PZ_Unlock(pool->lock);
             PORT_SetError(SEC_ERROR_NO_MEMORY);
             PORT_Assert(0);
             return /* no error indication available */ ;
         }
 
-        tm = *pw;
         *pw = (threadmark_mark *)NULL;
 
         if (! pool->first_mark ) {
             pool->marking_thread = (PRThread *)NULL;
         }
 
         PZ_Unlock(pool->lock);
     }
 #endif /* THREADMARK */
 }
@@ skipping 135 matching lines @@
     const unsigned char *b = (const unsigned char*) ib;
     size_t i;
     unsigned char r = 0;
 
     for (i = 0; i < n; ++i) {
         r |= *a++ ^ *b++;
     }
 
     return r;
 }