Update our use of strings to call their get methods bringing us up

to date with the trunk of mozilla.

security/manager/ssl/src/nsNSSCallbacks.cpp

@@ -92,12 +92,12 @@ char* PK11PasswordPrompt(PK11SlotInfo* slot, PRBool retry, void* arg) {
   if (NS_FAILED(rv))
     return nsnull; 
 
-  nssComponent->GetPIPNSSBundleString(NS_LITERAL_STRING("CertPassPrompt"),
+  nssComponent->GetPIPNSSBundleString(NS_LITERAL_STRING("CertPassPrompt").get(),
                                       promptString);
 
   PRUnichar *uniString = promptString.ToNewUnicode();
   rv = proxyPrompt->PromptPassword(nsnull, uniString,
-                                   NS_LITERAL_STRING(" "),
+                                   NS_LITERAL_STRING(" ").get(),
                                    nsIPrompt::SAVE_PASSWORD_NEVER,
                                    &password, &value);
   nsMemory::Free(uniString);
@@ -140,7 +140,7 @@ void HandshakeCallback(PRFileDesc* fd, void* client_data) {
       if (NS_FAILED(rv))
         return; 
 
-      rv = nssComponent->PIPBundleFormatStringFromName(NS_LITERAL_STRING("SignedBy"),
+      rv = nssComponent->PIPBundleFormatStringFromName(NS_LITERAL_STRING("SignedBy").get(),
                                                      formatStrings, 1,
                                                      getter_Copies(shortDesc));
 

security/manager/ssl/src/nsNSSCertificate.cpp

@@ -32,7 +32,7 @@
  * may use your version of this file under either the MPL or the
  * GPL.
  *
- * $Id: nsNSSCertificate.cpp,v 1.4 2001-03-07 19:24:11 mcgreer%netscape.com Exp $
+ * $Id: nsNSSCertificate.cpp,v 1.5 2001-03-08 23:15:16 javi%netscape.com Exp $
  */
 
 #include "prmem.h"
@@ -595,7 +595,7 @@ nsNSSCertificateDB::ImportCertificate(nsIX509Cert *cert,
                                       PRUint32 trusted,
                                       const PRUnichar *nickname)
 {
-  SECStatus srv;
+  SECStatus srv = SECFailure;
   nsresult nsrv;
   CERTCertificate *tmpCert = NULL;
   nsNSSCertTrust trust;
@@ -654,9 +654,8 @@ nsNSSCertificateDB::getCertNames(CERTCertList *certList,
                                  PRUint32      type, 
                                  nsString&     nameList)
 {
-  nsresult rv = NS_ERROR_FAILURE;
   CERTCertListNode *node;
-  int i, num = 0;
+  
   PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("List of certs:\n"));
   for (node = CERT_LIST_HEAD(certList);
        !CERT_LIST_END(node, certList);

security/manager/ssl/src/nsNSSComponent.cpp

@@ -177,7 +177,7 @@ nsNSSComponent::InstallLoadableRoots()
   if (!hasRoot) {
     nsresult rv;
     nsString modName;
-    rv = GetPIPNSSBundleString(NS_LITERAL_STRING("RootCertModuleName"),
+    rv = GetPIPNSSBundleString(NS_LITERAL_STRING("RootCertModuleName").get(),
                                modName);
     if (NS_FAILED(rv)) return;
 
@@ -256,32 +256,34 @@ nsNSSComponent::ConfigureInternalPKCS11Token()
   char *fipsSlotDescription        = NULL;
   char *fipsPrivateSlotDescription = NULL; 
 
-  manufacturerID = GetPK11String(NS_LITERAL_STRING("ManufacturerID"), 
+  manufacturerID = GetPK11String(NS_LITERAL_STRING("ManufacturerID").get(), 
                                  SHORT_PK11_STRING);
   if (manufacturerID == NULL) goto loser;
-  libraryDescription = GetPK11String(NS_LITERAL_STRING("LibraryDescription"), 
-                                     SHORT_PK11_STRING);
+  libraryDescription = 
+              GetPK11String(NS_LITERAL_STRING("LibraryDescription").get(), 
+                            SHORT_PK11_STRING);
   if (libraryDescription == NULL) goto loser;
-  tokenDescription = GetPK11String(NS_LITERAL_STRING("TokenDescription"), 
+  tokenDescription = GetPK11String(NS_LITERAL_STRING("TokenDescription").get(), 
                                    SHORT_PK11_STRING);
   if (tokenDescription == NULL) goto loser;
   privateTokenDescription = 
-                    GetPK11String(NS_LITERAL_STRING("PrivateTokenDescription"), 
-                                  SHORT_PK11_STRING);
+              GetPK11String(NS_LITERAL_STRING("PrivateTokenDescription").get(), 
+                            SHORT_PK11_STRING);
   if (privateTokenDescription == NULL) goto loser;
-  slotDescription = GetPK11String(NS_LITERAL_STRING("SlotDescription"), 
+  slotDescription = GetPK11String(NS_LITERAL_STRING("SlotDescription").get(), 
                                   LONG_PK11_STRING);
   if (slotDescription == NULL) goto loser;
   privateSlotDescription = 
-                     GetPK11String(NS_LITERAL_STRING("PrivateSlotDescription"), 
+              GetPK11String(NS_LITERAL_STRING("PrivateSlotDescription").get(), 
                                    LONG_PK11_STRING);
   if (privateSlotDescription == NULL) goto loser;
-  fipsSlotDescription = GetPK11String(NS_LITERAL_STRING("FipsSlotDescription"),
-                                      LONG_PK11_STRING);
+  fipsSlotDescription = 
+              GetPK11String(NS_LITERAL_STRING("FipsSlotDescription").get(),
+                            LONG_PK11_STRING);
   if (fipsSlotDescription == NULL) goto loser;
   fipsPrivateSlotDescription = 
-                 GetPK11String(NS_LITERAL_STRING("FipsPrivateSlotDescription"), 
-                               LONG_PK11_STRING);
+          GetPK11String(NS_LITERAL_STRING("FipsPrivateSlotDescription").get(), 
+                        LONG_PK11_STRING);
   if (fipsPrivateSlotDescription == NULL) goto loser;
 
   PK11_ConfigurePKCS11(manufacturerID, libraryDescription, tokenDescription,

security/manager/ssl/src/nsSDR.cpp

@@ -137,7 +137,7 @@ Encrypt(unsigned char * data, PRInt32 dataLen, unsigned char * *result, PRInt32
     if (NS_FAILED(rv)) goto loser;
 
     rv = dialogs->SetPassword(ctx,
-                              tokenName,
+                              tokenName.get(),
                               &canceled);
     NS_RELEASE(dialogs);
     if (NS_FAILED(rv)) goto loser;