Bug 398624 - "PRBool misuse bugs in extensions/pref/" [p=taras r=bienvenu a1.9=sayrer]
authorreed@reedloden.com
Fri, 19 Oct 2007 16:29:39 -0700
changeset 7060 09bff1cce6b4161e2eab24bf1d450bd4071199c1
parent 7059 53fd6cf2009ec2760e1ea7657bd0dacc59c99f76
child 7061 0f522a6394ebb7d323fdc680657e231029ed61d6
push idunknown
push userunknown
push dateunknown
reviewersbienvenu
bugs398624
milestone1.9a9pre
Bug 398624 - "PRBool misuse bugs in extensions/pref/" [p=taras r=bienvenu a1.9=sayrer]
extensions/pref/autoconfig/src/nsReadConfig.cpp
--- a/extensions/pref/autoconfig/src/nsReadConfig.cpp
+++ b/extensions/pref/autoconfig/src/nsReadConfig.cpp
@@ -211,17 +211,17 @@ nsresult nsReadConfig::readConfigFile()
 
     nsCOMPtr<nsIPrefBranch> prefBranch;
     rv = prefService->GetBranch(nsnull, getter_AddRefs(prefBranch));
     NS_ENSURE_SUCCESS(rv, rv);
 
     PRInt32 obscureValue = 0;
     (void) defaultPrefBranch->GetIntPref("general.config.obscure_value", &obscureValue);
     PR_LOG(MCD, PR_LOG_DEBUG, ("evaluating .cfg file %s with obscureValue %d\n", lockFileName.get(), obscureValue));
-    rv = openAndEvaluateJSFile(lockFileName.get(), PR_TRUE, obscureValue, PR_TRUE);
+    rv = openAndEvaluateJSFile(lockFileName.get(), obscureValue, PR_TRUE, PR_TRUE);
     if (NS_FAILED(rv))
     {
       PR_LOG(MCD, PR_LOG_DEBUG, ("error evaluating .cfg file %s %x\n", lockFileName.get(), rv));
       return rv;
     }
     
     rv = prefBranch->GetCharPref("general.config.filename", 
                                   getter_Copies(lockFileName));
@@ -262,18 +262,18 @@ nsresult nsReadConfig::readConfigFile()
             return NS_ERROR_FAILURE;
 
     }
   
     return NS_OK;
 } // ReadConfigFile
 
 
-nsresult nsReadConfig::openAndEvaluateJSFile(const char *aFileName, PRBool isEncoded, 
-                                             PRInt32 obscureValue,
+nsresult nsReadConfig::openAndEvaluateJSFile(const char *aFileName, PRInt32 obscureValue,
+                                             PRBool isEncoded,
                                              PRBool isBinDir)
 {
     nsresult rv;
     nsCOMPtr<nsIFile> jsFile;
 
     if (isBinDir) {
         rv = NS_GetSpecialDirectory(NS_XPCOM_CURRENT_PROCESS_DIR, 
                                     getter_AddRefs(jsFile));