From af6af017175f358f2cbd58935cbfb87cd8f0f4ae Mon Sep 17 00:00:00 2001 From: "norris%netscape.com" Date: Fri, 12 Nov 1999 03:07:37 +0000 Subject: [PATCH] Restore original changes with bustage fixes. git-svn-id: svn://10.0.0.236/trunk@53310 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/caps/src/nsScriptSecurityManager.cpp | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/mozilla/caps/src/nsScriptSecurityManager.cpp b/mozilla/caps/src/nsScriptSecurityManager.cpp index 3338257c781..826e322bc38 100644 --- a/mozilla/caps/src/nsScriptSecurityManager.cpp +++ b/mozilla/caps/src/nsScriptSecurityManager.cpp @@ -1965,7 +1965,7 @@ PR_STATIC_CALLBACK(void) enumeratePolicy(const char *prefName, void *policies) { if (!prefName || !*prefName) return; - int count = 0; + unsigned count = 0; const char *dots[5]; const char *p; for (p=prefName; *p; p++) { @@ -2000,16 +2000,11 @@ enumeratePolicy(const char *prefName, void *policies) { NS_IMETHODIMP nsScriptSecurityManager::InitFromPrefs() { - nsresult rv; - NS_WITH_SERVICE(nsIPref, prefs, kPrefServiceCID, &rv); - if (NS_FAILED(rv)) - return NS_ERROR_FAILURE; - /* - Comment out for now; for some reason nsIPref.idl isn't getting built - into inIPref.h in time. - + nsresult rv; + NS_WITH_SERVICE(nsIPref, prefs, kPrefServiceCID, &rv); + if (NS_FAILED(rv)) + return NS_ERROR_FAILURE; prefs->EnumerateChildren("security.policy", enumeratePolicy, (void *) domPropertyPolicyTypes); - */ return NS_OK; }