From 7d6a27aac51a6e3a18ba71bc47410fcfc04e9ae8 Mon Sep 17 00:00:00 2001
From: "javi%netscape.com" <javi%netscape.com>
Date: Thu, 13 Dec 2001 01:17:49 +0000
Subject: [PATCH] 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.
---
 security/manager/boot/src/nsSecureBrowserUIImpl.cpp | 2 +-
 security/manager/ssl/src/nsCertOutliner.cpp         | 4 ++--
 security/manager/ssl/src/nsCertTree.cpp             | 4 ++--
 security/manager/ssl/src/nsCrypto.cpp               | 2 +-
 security/manager/ssl/src/nsKeygenHandler.cpp        | 2 +-
 security/manager/ssl/src/nsNSSCertificate.cpp       | 4 ++--
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/security/manager/boot/src/nsSecureBrowserUIImpl.cpp b/security/manager/boot/src/nsSecureBrowserUIImpl.cpp
index 2106bef0ec7..ee2a9a515f0 100644
--- a/security/manager/boot/src/nsSecureBrowserUIImpl.cpp
+++ b/security/manager/boot/src/nsSecureBrowserUIImpl.cpp
@@ -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;
diff --git a/security/manager/ssl/src/nsCertOutliner.cpp b/security/manager/ssl/src/nsCertOutliner.cpp
index 5977ebd143a..6b16409415e 100644
--- a/security/manager/ssl/src/nsCertOutliner.cpp
+++ b/security/manager/ssl/src/nsCertOutliner.cpp
@@ -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) {
diff --git a/security/manager/ssl/src/nsCertTree.cpp b/security/manager/ssl/src/nsCertTree.cpp
index 5977ebd143a..6b16409415e 100644
--- a/security/manager/ssl/src/nsCertTree.cpp
+++ b/security/manager/ssl/src/nsCertTree.cpp
@@ -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) {
diff --git a/security/manager/ssl/src/nsCrypto.cpp b/security/manager/ssl/src/nsCrypto.cpp
index d5737b29835..2797d2f5d72 100644
--- a/security/manager/ssl/src/nsCrypto.cpp
+++ b/security/manager/ssl/src/nsCrypto.cpp
@@ -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);
       }
     }
diff --git a/security/manager/ssl/src/nsKeygenHandler.cpp b/security/manager/ssl/src/nsKeygenHandler.cpp
index d6090d01cb1..5ebb4690cfd 100644
--- a/security/manager/ssl/src/nsKeygenHandler.cpp
+++ b/security/manager/ssl/src/nsKeygenHandler.cpp
@@ -464,7 +464,7 @@ found_match:
             KeygenRunnable->Join();
 
             NS_RELEASE(dialogs);
-            if (!NS_FAILED(rv)) {
+            if (NS_SUCCEEDED(rv)) {
                 rv = KeygenRunnable->GetParams(&privateKey, &publicKey);
             }
         }
diff --git a/security/manager/ssl/src/nsNSSCertificate.cpp b/security/manager/ssl/src/nsNSSCertificate.cpp
index 7060d41d8a5..62615e6f2a8 100644
--- a/security/manager/ssl/src/nsNSSCertificate.cpp
+++ b/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.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);
     }
   }