Allow NSS to be built with NO_NSPR_10_SUPPORT.

nss/lib/util/utilpars.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/. */
 /* 
  * The following code handles the storage of PKCS 11 modules used by the
  * NSS. This file is written to abstract away how the modules are
  * stored so we can decide that later.
  */
 #include "secport.h"
 #include "prprf.h" 
@@ skipping 410 matching lines @@
 /************************************************************************
  * These functions are used in contructing strings.
  * NOTE: they will always return a string, but sometimes it will return
  * a specific NULL string. These strings must be freed with util_freePair.
  */
 
 /* string to return on error... */
 static char *nssutil_nullString = "";
 
 static char *
-nssutil_formatValue(PRArenaPool *arena, char *value, char quote)
+nssutil_formatValue(PLArenaPool *arena, char *value, char quote)
 {
     char *vp,*vp2,*retval;
     int size = 0, escapes = 0;
 
     for (vp=value; *vp ;vp++) {
         if ((*vp == quote) || (*vp == NSSUTIL_ARG_ESCAPE)) escapes++;
         size++;
     }
     if (arena) {
         retval = PORT_ArenaZAlloc(arena,size+escapes+1);
@@ skipping 171 matching lines @@
         slotInfo->defaultFlags |= PK11_OWN_PW_DEFAULTS;
     }
     slotInfo->hasRootCerts = NSSUTIL_ArgHasFlag("rootFlags", "hasRootCerts", 
                                                params);
     slotInfo->hasRootTrust = NSSUTIL_ArgHasFlag("rootFlags", "hasRootTrust", 
                                                params);
 }
 
 /* parse all the slot specific parameters. */
 struct NSSUTILPreSlotInfoStr *
-NSSUTIL_ArgParseSlotInfo(PRArenaPool *arena, char *slotParams, int *retCount)
+NSSUTIL_ArgParseSlotInfo(PLArenaPool *arena, char *slotParams, int *retCount)
 {
     char *slotIndex;
     struct NSSUTILPreSlotInfoStr *slotInfo = NULL;
     int i=0,count = 0,next;
 
     *retCount = 0;
     if ((slotParams == NULL) || (*slotParams == 0))  return NULL;
 
     /* first count the number of slots */
     for (slotIndex = NSSUTIL_ArgStrip(slotParams); *slotIndex; 
@@ skipping 474 matching lines @@
         value = PR_smprintf("%s" NSSUTIL_PATH_SEPARATOR "%s",
                         lconfigdir,secmodName);
    } else {
         value = PR_smprintf("%s",secmodName);
    }
    if (configdir) PORT_Free(configdir);
    return value;
 }