Fix compiler warnings under Linux

2 files changed, 16 insertions, 19 deletions

diff --git a/security/nss/lib/certdb/certi.h b/security/nss/lib/certdb/certi.h
index 1a6611b75..8d49dc90a 100644
--- a/security/nss/lib/certdb/certi.h
+++ b/security/nss/lib/certdb/certi.h
@@ -125,16 +125,16 @@ struct CachedCrlStr {
 };
 
 /* constructor */
-SECStatus CachedCrl_Create(CachedCrl** returned, CERTSignedCrl* crl,
+static SECStatus CachedCrl_Create(CachedCrl** returned, CERTSignedCrl* crl,
                            CRLOrigin origin);
 /* destructor */
-SECStatus CachedCrl_Destroy(CachedCrl* crl);
+static SECStatus CachedCrl_Destroy(CachedCrl* crl);
 
 /* create hash table of CRL entries */
-SECStatus CachedCrl_Populate(CachedCrl* crlobject);
+static SECStatus CachedCrl_Populate(CachedCrl* crlobject);
 
 /* empty the cache content */
-SECStatus CachedCrl_Depopulate(CachedCrl* crl);
+static SECStatus CachedCrl_Depopulate(CachedCrl* crl);
 
 /* are these CRLs the same, as far as the cache is concerned ?
    Or are they the same token object, but with different DER ? */
@@ -193,35 +193,35 @@ struct CRLDPCacheStr {
 };
 
 /* create a DPCache object */
-SECStatus DPCache_Create(CRLDPCache** returned, CERTCertificate* issuer,
+static SECStatus DPCache_Create(CRLDPCache** returned, CERTCertificate* issuer,
                          SECItem* subject, SECItem* dp);
 
 /* destructor for CRL DPCache object */
-SECStatus DPCache_Destroy(CRLDPCache* cache);
+static SECStatus DPCache_Destroy(CRLDPCache* cache);
 
 /* add a new CRL object to the dynamic array of CRLs of the DPCache, and
    returns the cached CRL object . Needs write access to DPCache. */
-SECStatus DPCache_AddCRL(CRLDPCache* cache, CachedCrl* crl, PRBool* added);
+static SECStatus DPCache_AddCRL(CRLDPCache* cache, CachedCrl* crl, PRBool* added);
 
 /* fetch the CRL for this DP from the PKCS#11 tokens */
-SECStatus DPCache_FetchFromTokens(CRLDPCache* cache, PRTime vfdate, void* wincx);
+static SECStatus DPCache_FetchFromTokens(CRLDPCache* cache, PRTime vfdate, void* wincx);
 
 /* check if a particular SN is in the CRL cache and return its entry */
-SECStatus DPCache_Lookup(CRLDPCache* cache, SECItem* sn, CERTCrlEntry** returned);
+static SECStatus DPCache_Lookup(CRLDPCache* cache, SECItem* sn, CERTCrlEntry** returned);
 
 /* update the content of the CRL cache, including fetching of CRLs, and
    reprocessing with specified issuer and date */
-SECStatus DPCache_GetUpToDate(CRLDPCache* cache, CERTCertificate* issuer,
+static SECStatus DPCache_GetUpToDate(CRLDPCache* cache, CERTCertificate* issuer,
                          PRBool readlocked, PRTime vfdate, void* wincx);
 
 /* returns true if there are CRLs from PKCS#11 slots */
-PRBool DPCache_HasTokenCRLs(CRLDPCache* cache);
+static PRBool DPCache_HasTokenCRLs(CRLDPCache* cache);
 
 /* remove CRL at offset specified */
-SECStatus DPCache_RemoveCRL(CRLDPCache* cache, PRUint32 offset);
+static SECStatus DPCache_RemoveCRL(CRLDPCache* cache, PRUint32 offset);
 
 /* Pick best CRL to use . needs write access */
-SECStatus DPCache_SelectCRL(CRLDPCache* cache);
+static SECStatus DPCache_SelectCRL(CRLDPCache* cache);
 
 /*  CRL issuer cache object
     This object tracks all the distribution point caches for a given issuer.
@@ -245,7 +245,7 @@ struct CRLIssuerCacheStr {
 };
 
 /* create an issuer cache object (per CA subject ) */
-SECStatus IssuerCache_Create(CRLIssuerCache** returned,
+static SECStatus IssuerCache_Create(CRLIssuerCache** returned,
                              CERTCertificate* issuer,
                              SECItem* subject, SECItem* dp);
 
@@ -253,11 +253,11 @@ SECStatus IssuerCache_Create(CRLIssuerCache** returned,
 SECStatus IssuerCache_Destroy(CRLIssuerCache* cache);
 
 /* add a DPCache to the issuer cache */
-SECStatus IssuerCache_AddDP(CRLIssuerCache* cache, CERTCertificate* issuer,
+static SECStatus IssuerCache_AddDP(CRLIssuerCache* cache, CERTCertificate* issuer,
                             SECItem* subject, SECItem* dp, CRLDPCache** newdpc);
 
 /* get a particular DPCache object from an IssuerCache */
-CRLDPCache* IssuerCache_GetDPCache(CRLIssuerCache* cache, SECItem* dp);
+static CRLDPCache* IssuerCache_GetDPCache(CRLIssuerCache* cache, SECItem* dp);
 
 
 /*  CRL revocation cache object
diff --git a/security/nss/lib/certdb/crl.c b/security/nss/lib/certdb/crl.c
index 52fc56f09..e5d8ff8df 100644
--- a/security/nss/lib/certdb/crl.c
+++ b/security/nss/lib/certdb/crl.c
@@ -1869,7 +1869,6 @@ static int SortCRLsByThisUpdate(const void* arg1, const void* arg2)
     PRTime timea, timeb;
     SECStatus rv = SECSuccess;
     CachedCrl* a, *b;
-    PRBool agood = PR_FALSE, bgood = PR_FALSE;
 
     a = (CachedCrl*) arg1;
     b = (CachedCrl*) arg2;
@@ -1916,7 +1915,6 @@ static int SortCRLsByThisUpdate(const void* arg1, const void* arg2)
 static int SortImperfectCRLs(const void* arg1, const void* arg2)
 {
     CachedCrl* a, *b;
-    PRBool agood = PR_FALSE, bgood = PR_FALSE;
 
     a = (CachedCrl*) arg1;
     b = (CachedCrl*) arg2;
@@ -2214,7 +2212,6 @@ static SECStatus CRLCache_GetIssuerCache(CRLCache* cache, SECItem* subject,
 /* retrieve the full CRL object that best matches the content of a DPCache */
 static CERTSignedCrl* GetBestCRL(CRLDPCache* cache, PRBool entries)
 {
-    PRInt32 i = 0;
     CachedCrl* acrl = NULL;
 
     PORT_Assert(cache);