mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-17 07:15:46 +00:00
Patch for Bug 11080, r=kaie, sr=jag
Checking in for timeless. Don't use the negation form of the NS_SUCCEEDED NS_FAILED macros.
This commit is contained in:
parent
74151505f6
commit
ba5b82388a
@ -223,7 +223,7 @@ static PRInt32 GetSecurityStateFromChannel(nsIChannel* aChannel)
|
||||
(nsISupports *)info));
|
||||
|
||||
res = psmInfo->GetSecurityState(&securityState);
|
||||
if (!NS_SUCCEEDED(res)) {
|
||||
if (NS_FAILED(res)) {
|
||||
PR_LOG(gSecureDocLog, PR_LOG_DEBUG, ("SecureUI: GetSecurityState:%p - GetSecurityState failed: %d\n",
|
||||
aChannel, res));
|
||||
securityState = nsIWebProgressListener::STATE_IS_BROKEN;
|
||||
|
@ -521,13 +521,13 @@ nsCertOutliner::GetCellText(PRInt32 row, const PRUnichar *colID,
|
||||
nsAutoString vfy;
|
||||
rv = nssComponent->GetPIPNSSBundleString(
|
||||
NS_LITERAL_STRING("VerifiedTrue").get(), vfy);
|
||||
if (!NS_FAILED(rv))
|
||||
if (NS_SUCCEEDED(rv))
|
||||
wstr = ToNewUnicode(vfy);
|
||||
} else {
|
||||
nsAutoString vfy;
|
||||
rv = nssComponent->GetPIPNSSBundleString(
|
||||
NS_LITERAL_STRING("VerifiedFalse").get(), vfy);
|
||||
if (!NS_FAILED(rv))
|
||||
if (NS_SUCCEEDED(rv))
|
||||
wstr = ToNewUnicode(vfy);
|
||||
}
|
||||
if (ocspEnabled) {
|
||||
|
@ -521,13 +521,13 @@ nsCertOutliner::GetCellText(PRInt32 row, const PRUnichar *colID,
|
||||
nsAutoString vfy;
|
||||
rv = nssComponent->GetPIPNSSBundleString(
|
||||
NS_LITERAL_STRING("VerifiedTrue").get(), vfy);
|
||||
if (!NS_FAILED(rv))
|
||||
if (NS_SUCCEEDED(rv))
|
||||
wstr = ToNewUnicode(vfy);
|
||||
} else {
|
||||
nsAutoString vfy;
|
||||
rv = nssComponent->GetPIPNSSBundleString(
|
||||
NS_LITERAL_STRING("VerifiedFalse").get(), vfy);
|
||||
if (!NS_FAILED(rv))
|
||||
if (NS_SUCCEEDED(rv))
|
||||
wstr = ToNewUnicode(vfy);
|
||||
}
|
||||
if (ocspEnabled) {
|
||||
|
@ -668,7 +668,7 @@ cryptojs_generateOneKeyPair(JSContext *cx, nsKeyPairInfo *keyPairInfo,
|
||||
KeygenRunnable->Join();
|
||||
|
||||
NS_RELEASE(dialogs);
|
||||
if (!NS_FAILED(rv)) {
|
||||
if (NS_SUCCEEDED(rv)) {
|
||||
rv = KeygenRunnable->GetParams(&keyPairInfo->privKey, &keyPairInfo->pubKey);
|
||||
}
|
||||
}
|
||||
|
@ -464,7 +464,7 @@ found_match:
|
||||
KeygenRunnable->Join();
|
||||
|
||||
NS_RELEASE(dialogs);
|
||||
if (!NS_FAILED(rv)) {
|
||||
if (NS_SUCCEEDED(rv)) {
|
||||
rv = KeygenRunnable->GetParams(&privateKey, &publicKey);
|
||||
}
|
||||
}
|
||||
|
@ -32,7 +32,7 @@
|
||||
* may use your version of this file under either the MPL or the
|
||||
* GPL.
|
||||
*
|
||||
* $Id: nsNSSCertificate.cpp,v 1.56 2001/12/11 05:59:49 rangansen%netscape.com Exp $
|
||||
* $Id: nsNSSCertificate.cpp,v 1.57 2001/12/13 01:17:49 javi%netscape.com Exp $
|
||||
*/
|
||||
|
||||
#include "prmem.h"
|
||||
@ -1242,7 +1242,7 @@ nsNSSCertificate::GetTokenName(PRUnichar **aTokenName)
|
||||
if (NS_FAILED(rv)) return rv;
|
||||
rv = nssComponent->GetPIPNSSBundleString(
|
||||
NS_LITERAL_STRING("InternalToken").get(), tok);
|
||||
if (!NS_FAILED(rv))
|
||||
if (NS_SUCCEEDED(rv))
|
||||
*aTokenName = ToNewUnicode(tok);
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user