From 30461751004db1c9c90e2ce1d289dd2dae420b6f Mon Sep 17 00:00:00 2001
From: "julien.pierre.bugs%sun.com" <julien.pierre.bugs%sun.com>
Date: Tue, 17 May 2005 17:41:17 +0000
Subject: [PATCH] Rename NEXT_ITERATION macro to NEXT_USAGE to make code
 clearer

---
 security/nss/lib/certhigh/certvfy.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/security/nss/lib/certhigh/certvfy.c b/security/nss/lib/certhigh/certvfy.c
index 580e3063b9a3..25d0eaf42d7d 100644
--- a/security/nss/lib/certhigh/certvfy.c
+++ b/security/nss/lib/certhigh/certvfy.c
@@ -1139,14 +1139,14 @@ done:
     return rv;
 }
 
-#define NEXT_ITERATION() { \
+#define NEXT_USAGE() { \
     i*=2; \
     certUsage++; \
     continue; \
 }
 
 #define VALID_USAGE() { \
-    NEXT_ITERATION(); \
+    NEXT_USAGE(); \
 }
 
 #define INVALID_USAGE() { \
@@ -1156,7 +1156,7 @@ done:
     if (PR_TRUE == requiredUsage) { \
         valid = SECFailure; \
     } \
-    NEXT_ITERATION(); \
+    NEXT_USAGE(); \
 }
 
 /*
@@ -1233,7 +1233,7 @@ CERT_VerifyCertificate(CERTCertDBHandle *handle, CERTCertificate *cert,
     for (i=1;i<=certificateUsageHighest && !(SECFailure == valid && !returnedUsages) ;) {
         PRBool requiredUsage = (i & requiredUsages) ? PR_TRUE : PR_FALSE;
         if (PR_FALSE == requiredUsage && PR_FALSE == checkAllUsages) {
-            NEXT_ITERATION();
+            NEXT_USAGE();
         }
         if (returnedUsages) {
             *returnedUsages |= i; /* start off assuming this usage is valid */
@@ -1264,7 +1264,7 @@ CERT_VerifyCertificate(CERTCertDBHandle *handle, CERTCertificate *cert,
           case certUsageUserCertImport:
           case certUsageVerifyCA:
               /* these usages cannot be verified */
-              NEXT_ITERATION();
+              NEXT_USAGE();
 
           default:
             PORT_Assert(0);
@@ -1408,7 +1408,7 @@ CERT_VerifyCertificate(CERTCertDBHandle *handle, CERTCertificate *cert,
             }
         }
 
-        NEXT_ITERATION();
+        NEXT_USAGE();
     }
     
     return(valid);