Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

checking in for jag.

Browse Source 
Bug 88413 -- replace nsString::GetUnicode() with get().  r=dbaron, rs=scc.


git-svn-id: svn://10.0.0.236/trunk@98376 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
bryner%uiuc.edu
2001-06-30 18:04:39 +00:00
parent 101f64e604
commit 9e8f4a67be
3 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mozilla/security/manager/pki/src/nsNSSDialogs.cpp
View File

@@ -365,7 +365,7 @@ nsNSSDialogs::CertExpired(nsITransportSecurityInfo *socketInfo,
PRUnichar *formattedDatePR = formattedDate.ToNewUnicode();
const PRUnichar *formatStrings[2] = { commonName, formattedDatePR };
nsString keyString = NS_ConvertASCIItoUCS2(key);
mPIPStringBundle->FormatStringFromName(keyString.GetUnicode(), formatStrings,
mPIPStringBundle->FormatStringFromName(keyString.get(), formatStrings,
2, getter_Copies(message1));
Recycle(commonName);

26
mozilla/security/manager/ssl/src/nsNSSCertificate.cpp
View File

@@ -32,7 +32,7 @@
* may use your version of this file under either the MPL or the
* GPL.
*
* $Id: nsNSSCertificate.cpp,v 1.36 2001-06-27 00:33:17 javi%netscape.com Exp $
* $Id: nsNSSCertificate.cpp,v 1.37 2001-06-30 18:04:38 bryner%uiuc.edu Exp $
*/
#include "prmem.h"
@@ -1036,7 +1036,7 @@ nsNSSCertificate::GetUsageArray(char *suffix,
nsAutoString verifyDesc;
nsAutoString typestr(NS_LITERAL_STRING("VerifySSLClient").get());
typestr.AppendWithConversion(suffix);
rv = nssComponent->GetPIPNSSBundleString(typestr.GetUnicode(), verifyDesc);
rv = nssComponent->GetPIPNSSBundleString(typestr.get(), verifyDesc);
tmpUsages[tmpCount++] = verifyDesc.ToNewUnicode();
}
if (CERT_VerifyCertNow(defaultcertdb, mCert, PR_TRUE,
@@ -1045,7 +1045,7 @@ nsNSSCertificate::GetUsageArray(char *suffix,
nsAutoString verifyDesc;
nsAutoString typestr(NS_LITERAL_STRING("VerifySSLServer").get());
typestr.AppendWithConversion(suffix);
rv = nssComponent->GetPIPNSSBundleString(typestr.GetUnicode(), verifyDesc);
rv = nssComponent->GetPIPNSSBundleString(typestr.get(), verifyDesc);
tmpUsages[tmpCount++] = verifyDesc.ToNewUnicode();
}
if (CERT_VerifyCertNow(defaultcertdb, mCert, PR_TRUE,
@@ -1054,7 +1054,7 @@ nsNSSCertificate::GetUsageArray(char *suffix,
nsAutoString verifyDesc;
nsAutoString typestr(NS_LITERAL_STRING("VerifySSLStepUp").get());
typestr.AppendWithConversion(suffix);
rv = nssComponent->GetPIPNSSBundleString(typestr.GetUnicode(), verifyDesc);
rv = nssComponent->GetPIPNSSBundleString(typestr.get(), verifyDesc);
tmpUsages[tmpCount++] = verifyDesc.ToNewUnicode();
}
if (CERT_VerifyCertNow(defaultcertdb, mCert, PR_TRUE,
@@ -1063,7 +1063,7 @@ nsNSSCertificate::GetUsageArray(char *suffix,
nsAutoString verifyDesc;
nsAutoString typestr(NS_LITERAL_STRING("VerifyEmailSigner").get());
typestr.AppendWithConversion(suffix);
rv = nssComponent->GetPIPNSSBundleString(typestr.GetUnicode(), verifyDesc);
rv = nssComponent->GetPIPNSSBundleString(typestr.get(), verifyDesc);
tmpUsages[tmpCount++] = verifyDesc.ToNewUnicode();
}
if (CERT_VerifyCertNow(defaultcertdb, mCert, PR_TRUE,
@@ -1072,7 +1072,7 @@ nsNSSCertificate::GetUsageArray(char *suffix,
nsAutoString verifyDesc;
nsAutoString typestr(NS_LITERAL_STRING("VerifyEmailRecip").get());
typestr.AppendWithConversion(suffix);
rv = nssComponent->GetPIPNSSBundleString(typestr.GetUnicode(), verifyDesc);
rv = nssComponent->GetPIPNSSBundleString(typestr.get(), verifyDesc);
tmpUsages[tmpCount++] = verifyDesc.ToNewUnicode();
}
if (CERT_VerifyCertNow(defaultcertdb, mCert, PR_TRUE,
@@ -1081,7 +1081,7 @@ nsNSSCertificate::GetUsageArray(char *suffix,
nsAutoString verifyDesc;
nsAutoString typestr(NS_LITERAL_STRING("VerifyObjSign").get());
typestr.AppendWithConversion(suffix);
rv = nssComponent->GetPIPNSSBundleString(typestr.GetUnicode(), verifyDesc);
rv = nssComponent->GetPIPNSSBundleString(typestr.get(), verifyDesc);
tmpUsages[tmpCount++] = verifyDesc.ToNewUnicode();
}
#if 0
@@ -1091,7 +1091,7 @@ nsNSSCertificate::GetUsageArray(char *suffix,
nsAutoString verifyDesc;
nsAutoString typestr(NS_LITERAL_STRING("VerifyProtectObjSign").get());
typestr.AppendWithConversion(suffix);
rv = nssComponent->GetPIPNSSBundleString(typestr.GetUnicode(), verifyDesc);
rv = nssComponent->GetPIPNSSBundleString(typestr.get(), verifyDesc);
tmpUsages[tmpCount++] = verifyDesc.ToNewUnicode();
}
if (CERT_VerifyCertNow(defaultcertdb, mCert, PR_TRUE,
@@ -1100,7 +1100,7 @@ nsNSSCertificate::GetUsageArray(char *suffix,
nsAutoString verifyDesc;
nsAutoString typestr(NS_LITERAL_STRING("VerifyUserImport").get());
typestr.AppendWithConversion(suffix);
rv = nssComponent->GetPIPNSSBundleString(typestr.GetUnicode(), verifyDesc);
rv = nssComponent->GetPIPNSSBundleString(typestr.get(), verifyDesc);
tmpUsages[tmpCount++] = verifyDesc.ToNewUnicode();
}
#endif
@@ -1110,7 +1110,7 @@ nsNSSCertificate::GetUsageArray(char *suffix,
nsAutoString verifyDesc;
nsAutoString typestr(NS_LITERAL_STRING("VerifySSLCA").get());
typestr.AppendWithConversion(suffix);
rv = nssComponent->GetPIPNSSBundleString(typestr.GetUnicode(), verifyDesc);
rv = nssComponent->GetPIPNSSBundleString(typestr.get(), verifyDesc);
tmpUsages[tmpCount++] = verifyDesc.ToNewUnicode();
}
#if 0
@@ -1120,7 +1120,7 @@ nsNSSCertificate::GetUsageArray(char *suffix,
nsAutoString verifyDesc;
nsAutoString typestr(NS_LITERAL_STRING("VerifyCAVerifier").get());
typestr.AppendWithConversion(suffix);
rv = nssComponent->GetPIPNSSBundleString(typestr.GetUnicode(), verifyDesc);
rv = nssComponent->GetPIPNSSBundleString(typestr.get(), verifyDesc);
tmpUsages[tmpCount++] = verifyDesc.ToNewUnicode();
}
#endif
@@ -1130,7 +1130,7 @@ nsNSSCertificate::GetUsageArray(char *suffix,
nsAutoString verifyDesc;
nsAutoString typestr(NS_LITERAL_STRING("VerifyStatusResponder").get());
typestr.AppendWithConversion(suffix);
rv = nssComponent->GetPIPNSSBundleString(typestr.GetUnicode(), verifyDesc);
rv = nssComponent->GetPIPNSSBundleString(typestr.get(), verifyDesc);
tmpUsages[tmpCount++] = verifyDesc.ToNewUnicode();
}
#if 0
@@ -1140,7 +1140,7 @@ nsNSSCertificate::GetUsageArray(char *suffix,
nsAutoString verifyDesc;
nsAutoString typestr(NS_LITERAL_STRING("VerifyAnyCA").get());
typestr.AppendWithConversion(suffix);
rv = nssComponent->GetPIPNSSBundleString(typestr.GetUnicode(), verifyDesc);
rv = nssComponent->GetPIPNSSBundleString(typestr.get(), verifyDesc);
tmpUsages[tmpCount++] = verifyDesc.ToNewUnicode();
}
#endif

14
mozilla/security/manager/ssl/src/nsPKCS12Blob.cpp
View File

@@ -31,7 +31,7 @@
* may use your version of this file under either the MPL or the
* GPL.
*
* $Id: nsPKCS12Blob.cpp,v 1.14 2001-06-29 04:35:04 javi%netscape.com Exp $
* $Id: nsPKCS12Blob.cpp,v 1.15 2001-06-30 18:04:39 bryner%uiuc.edu Exp $
*/
#include "prmem.h"
@@ -624,14 +624,14 @@ nsPKCS12Blob::handleError(int myerr)
NS_LITERAL_STRING("SuccessfulP12Restore").get(),
errorMsg);
if (NS_FAILED(rv)) return rv;
errPrompt->Alert(nsnull, errorMsg.GetUnicode());
errPrompt->Alert(nsnull, errorMsg.get());
return PR_TRUE;
case PIP_PKCS12_BACKUP_OK:
rv = nssComponent->GetPIPNSSBundleString(
NS_LITERAL_STRING("SuccessfulP12Backup").get(),
errorMsg);
if (NS_FAILED(rv)) return rv;
errPrompt->Alert(nsnull, errorMsg.GetUnicode());
errPrompt->Alert(nsnull, errorMsg.get());
return PR_TRUE;
case PIP_PKCS12_USER_CANCELED:
return PR_TRUE; /* Just ignore it for now */
@@ -657,7 +657,7 @@ nsPKCS12Blob::handleError(int myerr)
NS_LITERAL_STRING("PKCS12PasswordInvalid").get(),
errorMsg);
if (NS_FAILED(rv)) return rv;
errPrompt->Alert(nsnull, errorMsg.GetUnicode());
errPrompt->Alert(nsnull, errorMsg.get());
break;
#endif
case SEC_ERROR_BAD_PASSWORD:
@@ -665,7 +665,7 @@ nsPKCS12Blob::handleError(int myerr)
NS_LITERAL_STRING("PK11BadPassword").get(),
errorMsg);
if (NS_FAILED(rv)) return rv;
errPrompt->Alert(nsnull, errorMsg.GetUnicode());
errPrompt->Alert(nsnull, errorMsg.get());
break;
case SEC_ERROR_BAD_DER:
case SEC_ERROR_PKCS12_CORRUPT_PFX_STRUCTURE:
@@ -674,14 +674,14 @@ nsPKCS12Blob::handleError(int myerr)
NS_LITERAL_STRING("PKCS12DecodeErr").get(),
errorMsg);
if (NS_FAILED(rv)) return rv;
errPrompt->Alert(nsnull, errorMsg.GetUnicode());
errPrompt->Alert(nsnull, errorMsg.get());
break;
default:
rv = nssComponent->GetPIPNSSBundleString(
NS_LITERAL_STRING("PKCS12UnknownErrRestore").get(),
errorMsg);
if (NS_FAILED(rv)) return rv;
errPrompt->Alert(nsnull, errorMsg.GetUnicode());
errPrompt->Alert(nsnull, errorMsg.get());
}
if (NS_FAILED(rv)) return rv;
return keepGoing;