Update NSS to 3.21 RTM and NSPR to 4.11 RTM

nspr/pr/src/io/prprf.c

 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /* 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/. */
 
 /*
 ** Portable safe sprintf code.
 **
 ** Author: Kipp E.B. Hickman
 */
@@ skipping 48 matching lines @@
         const char *s;
         int *ip;
 #ifdef WIN32
         const WCHAR *ws;
 #endif
     } u;
 };
 
 #define NAS_DEFAULT_NUM 20  /* default number of NumberedArgument array */
 
-
+/*
+** For numeric types, the signed versions must have even values,
+** and their corresponding unsigned versions must have the subsequent
+** odd value.
+*/
 #define TYPE_INT16      0
 #define TYPE_UINT16     1
 #define TYPE_INTN       2
 #define TYPE_UINTN      3
 #define TYPE_INT32      4
 #define TYPE_UINT32     5
 #define TYPE_INT64      6
 #define TYPE_UINT64     7
 #define TYPE_STRING     8
 #define TYPE_DOUBLE     9
@@ skipping 289 matching lines @@
     } else {
         slen = strlen(str);
     }
 
     /* and away we go */
     return fill2(ss, str, slen, width, flags);
 }
 
 /*
 ** BuildArgArray stands for Numbered Argument list Sprintf
-** for example,  
-**      fmp = "%4$i, %2$d, %3s, %1d";
+** for example,
+**      fmt = "%4$i, %2$d, %3s, %1d";
 ** the number must start from 1, and no gap among them
 */
 
 static struct NumArg* BuildArgArray( const char *fmt, va_list ap, int* rv, struct NumArg* nasArray )
 {
     int number = 0, cn = 0, i;
     const char* p;
     char  c;
     struct NumArg* nas;
     
@@ skipping 117 matching lines @@
             /* XXX not quite sure here */
             nas[cn].type = TYPE_INT64;
             c = *p++;
         } else if (c == 'l') {
             nas[cn].type = TYPE_INT32;
             c = *p++;
             if (c == 'l') {
                 nas[cn].type = TYPE_INT64;
                 c = *p++;
             }
+        } else if (c == 'z') {
+            if (sizeof(size_t) == sizeof(PRInt32)) {
+                nas[ cn ].type = TYPE_INT32;
+            } else if (sizeof(size_t) == sizeof(PRInt64)) {
+                nas[ cn ].type = TYPE_INT64;
+            } else {
+                nas[ cn ].type = TYPE_UNKNOWN;
+            }
+            c = *p++;
         }
 
         /* format */
         switch (c) {
         case 'd':
         case 'c':
         case 'i':
         case 'o':
         case 'u':
         case 'x':
@@ skipping 274 matching lines @@
             /* XXX not quite sure here */
             type = TYPE_INT64;
             c = *fmt++;
         } else if (c == 'l') {
             type = TYPE_INT32;
             c = *fmt++;
             if (c == 'l') {
                 type = TYPE_INT64;
                 c = *fmt++;
             }
+        } else if (c == 'z') {
+            if (sizeof(size_t) == sizeof(PRInt32)) {
+                type = TYPE_INT32;
+            } else if (sizeof(size_t) == sizeof(PRInt64)) {
+                type = TYPE_INT64;
+            }
+            c = *fmt++;
         }
 
         /* format */
         hexp = hex;
         switch (c) {
           case 'd': case 'i':                   /* decimal/integer */
             radix = 10;
             goto fetch_and_convert;
 
           case 'o':                             /* octal */
@@ skipping 417 matching lines @@
     rv = dosprintf(&ss, fmt, ap);
     if (rv < 0) {
         if (ss.base) {
             PR_DELETE(ss.base);
         }
         return 0;
     }
     return ss.base;
 }