From b75b28be3535c81068cafda312e2deff1930b482 Mon Sep 17 00:00:00 2001 From: "valeski%netscape.com" Date: Tue, 5 Jun 2001 21:25:57 +0000 Subject: [PATCH] r=chak, sr=vidur, a=tor. 82000. removing unused arg from nsICategoryManager. git-svn-id: svn://10.0.0.236/trunk@96452 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/embedding/browser/build/nsWebBrowserModule.cpp | 3 +-- mozilla/extensions/cookie/nsCookieHTTPNotify.cpp | 5 ++--- mozilla/extensions/p3p/src/nsP3PService.cpp | 4 +--- mozilla/js/jsd/jsd_xpc.cpp | 2 +- .../js/src/xpconnect/loader/mozJSComponentLoader.cpp | 3 +-- mozilla/modules/libpref/src/nsPrefsFactory.cpp | 2 +- mozilla/netwerk/build/nsNetModule.cpp | 10 ++++------ mozilla/xpcom/components/nsCategoryManager.cpp | 5 +---- mozilla/xpcom/components/nsICategoryManager.idl | 3 +-- mozilla/xpfe/appshell/public/nsICmdLineHandler.idl | 3 +-- mozilla/xpfe/appshell/src/nsPreloader.cpp | 2 +- mozilla/xpfe/components/build/nsModule.cpp | 5 ++--- .../components/startup/public/nsICmdLineHandler.idl | 3 +-- 13 files changed, 18 insertions(+), 32 deletions(-) diff --git a/mozilla/embedding/browser/build/nsWebBrowserModule.cpp b/mozilla/embedding/browser/build/nsWebBrowserModule.cpp index daf60811236..81de0432c61 100644 --- a/mozilla/embedding/browser/build/nsWebBrowserModule.cpp +++ b/mozilla/embedding/browser/build/nsWebBrowserModule.cpp @@ -61,10 +61,9 @@ UnregisterContentPolicy(nsIComponentManager *aCompMgr, nsIFile *aPath, do_GetService(NS_CATEGORYMANAGER_CONTRACTID, &rv); if (NS_FAILED(rv)) return rv; - nsXPIDLCString previous; return catman->DeleteCategoryEntry("content-policy", NS_WEBBROWSERCONTENTPOLICY_CONTRACTID, - PR_TRUE, getter_Copies(previous)); + PR_TRUE); } // Component Table diff --git a/mozilla/extensions/cookie/nsCookieHTTPNotify.cpp b/mozilla/extensions/cookie/nsCookieHTTPNotify.cpp index 84103bc77db..8e4e1c3fc1d 100644 --- a/mozilla/extensions/cookie/nsCookieHTTPNotify.cpp +++ b/mozilla/extensions/cookie/nsCookieHTTPNotify.cpp @@ -85,9 +85,8 @@ NS_METHOD nsCookieHTTPNotify::UnregisterProc(nsIComponentManager *aCompMgr, nsCOMPtr catman = do_GetService(NS_CATEGORYMANAGER_CONTRACTID, &rv); if (NS_FAILED(rv)) return rv; - nsXPIDLCString prevEntry; - rv = catman->DeleteCategoryEntry(NS_HTTP_STARTUP_CATEGORY, NS_COOKIEHTTPNOTIFY_CONTRACTID, PR_TRUE, - getter_Copies(prevEntry)); + rv = catman->DeleteCategoryEntry(NS_HTTP_STARTUP_CATEGORY, + NS_COOKIEHTTPNOTIFY_CONTRACTID, PR_TRUE); // Return value is not used from this function. return NS_OK; diff --git a/mozilla/extensions/p3p/src/nsP3PService.cpp b/mozilla/extensions/p3p/src/nsP3PService.cpp index ebe3fdef666..42a4d435510 100644 --- a/mozilla/extensions/p3p/src/nsP3PService.cpp +++ b/mozilla/extensions/p3p/src/nsP3PService.cpp @@ -128,7 +128,6 @@ nsP3PService::CategoryUnregister( nsIComponentManager *aComponentManage nsCOMPtr pCategoryManager; - nsXPIDLCString xcsPrevEntry; pCategoryManager = do_GetService( NS_CATEGORYMANAGER_CONTRACTID, @@ -137,8 +136,7 @@ nsP3PService::CategoryUnregister( nsIComponentManager *aComponentManage if (NS_SUCCEEDED( rv )) { rv = pCategoryManager->DeleteCategoryEntry( NS_HTTP_STARTUP_CATEGORY, NS_P3PSERVICE_CONTRACTID, - PR_TRUE, - getter_Copies( xcsPrevEntry ) ); + PR_TRUE ); } return rv; diff --git a/mozilla/js/jsd/jsd_xpc.cpp b/mozilla/js/jsd/jsd_xpc.cpp index 157d89c8a1a..e99a3081f32 100644 --- a/mozilla/js/jsd/jsd_xpc.cpp +++ b/mozilla/js/jsd/jsd_xpc.cpp @@ -1233,7 +1233,7 @@ UnRegisterASObserver(nsIComponentManager *aCompMgr, nsIFile *aPath, rv = categoryManager->DeleteCategoryEntry(APPSTART_CATEGORY, "JSDebugger app-start observer", - PR_TRUE,nsnull); + PR_TRUE); } return rv; } diff --git a/mozilla/js/src/xpconnect/loader/mozJSComponentLoader.cpp b/mozilla/js/src/xpconnect/loader/mozJSComponentLoader.cpp index 55ad49b0e1d..044b0631c97 100644 --- a/mozilla/js/src/xpconnect/loader/mozJSComponentLoader.cpp +++ b/mozilla/js/src/xpconnect/loader/mozJSComponentLoader.cpp @@ -1321,8 +1321,7 @@ UnregisterJSLoader(nsIComponentManager *aCompMgr, nsIFile *aPath, // only unregister if we're the current JS component loader if (!strcmp(jsLoader, mozJSComponentLoaderContractID)) { return catman->DeleteCategoryEntry("component-loader", - jsComponentTypeName, PR_TRUE, - getter_Copies(jsLoader)); + jsComponentTypeName, PR_TRUE); } return NS_OK; } diff --git a/mozilla/modules/libpref/src/nsPrefsFactory.cpp b/mozilla/modules/libpref/src/nsPrefsFactory.cpp index c69b9d59ddd..5553e33fd01 100644 --- a/mozilla/modules/libpref/src/nsPrefsFactory.cpp +++ b/mozilla/modules/libpref/src/nsPrefsFactory.cpp @@ -73,7 +73,7 @@ UnRegisterAutoConfig(nsIComponentManager *aCompMgr, if (NS_SUCCEEDED(rv)) { rv = categoryManager->DeleteCategoryEntry(APPSTARTUP_CATEGORY, "AutoConfig Module", - PR_TRUE,nsnull); + PR_TRUE); } return rv; } diff --git a/mozilla/netwerk/build/nsNetModule.cpp b/mozilla/netwerk/build/nsNetModule.cpp index 2499c455786..67fad33e52a 100644 --- a/mozilla/netwerk/build/nsNetModule.cpp +++ b/mozilla/netwerk/build/nsNetModule.cpp @@ -161,8 +161,7 @@ UnregisterBasicAuth(nsIComponentManager *aCompMgr, nsIFile *aPath, // only unregister if we're the current Basic-auth handler if (!strcmp(basicAuth, NS_BASICAUTH_CONTRACTID)) - return catman->DeleteCategoryEntry("http-auth", "basic", PR_TRUE, - getter_Copies(basicAuth)); + return catman->DeleteCategoryEntry("http-auth", "basic", PR_TRUE); return NS_OK; } #endif @@ -284,14 +283,13 @@ UnregisterStreamConverters(nsIComponentManager *aCompMgr, nsIFile *aPath, do_GetService(NS_CATEGORYMANAGER_CONTRACTID, &rv); if (NS_FAILED(rv)) return rv; - nsXPIDLCString entry; PRUint32 count = 0; while (count < g_StreamConverterCount) { - rv = catmgr->DeleteCategoryEntry(NS_ISTREAMCONVERTER_KEY, g_StreamConverterArray[count], - PR_TRUE, getter_Copies(entry)); + rv = catmgr->DeleteCategoryEntry(NS_ISTREAMCONVERTER_KEY, + g_StreamConverterArray[count], + PR_TRUE); if (NS_FAILED(rv)) return rv; - NS_ASSERTION(entry, "deleting an entry that doesn't exist"); count++; } return rv; diff --git a/mozilla/xpcom/components/nsCategoryManager.cpp b/mozilla/xpcom/components/nsCategoryManager.cpp index 8977fa2c88a..5ab3fec56c5 100644 --- a/mozilla/xpcom/components/nsCategoryManager.cpp +++ b/mozilla/xpcom/components/nsCategoryManager.cpp @@ -390,14 +390,11 @@ nsCategoryManager::AddCategoryEntry( const char *aCategoryName, NS_IMETHODIMP nsCategoryManager::DeleteCategoryEntry( const char *aCategoryName, const char *aEntryName, - PRBool aDontPersist, - char **_retval ) + PRBool aDontPersist) { NS_ASSERTION(aCategoryName, "aCategoryName is NULL!"); NS_ASSERTION(aEntryName, "aEntryName is NULL!"); - NS_ASSERTION(_retval, "_retval is NULL!"); - /* Note: no errors are reported since failure to delete diff --git a/mozilla/xpcom/components/nsICategoryManager.idl b/mozilla/xpcom/components/nsICategoryManager.idl index 7888bf5270b..e19ec26c300 100644 --- a/mozilla/xpcom/components/nsICategoryManager.idl +++ b/mozilla/xpcom/components/nsICategoryManager.idl @@ -56,9 +56,8 @@ interface nsICategoryManager : nsISupports * @param aCategory The name of the category ("protocol") * @param aEntry The entry to be added ("http") * @param aPersist Delete entry from registry, if present? - * @return Previous entry, null if none. */ - string deleteCategoryEntry(in string aCategory, in string aEntry, + void deleteCategoryEntry(in string aCategory, in string aEntry, in boolean aPersist); /** diff --git a/mozilla/xpfe/appshell/public/nsICmdLineHandler.idl b/mozilla/xpfe/appshell/public/nsICmdLineHandler.idl index b40d34015e6..f5567e6525f 100644 --- a/mozilla/xpfe/appshell/public/nsICmdLineHandler.idl +++ b/mozilla/xpfe/appshell/public/nsICmdLineHandler.idl @@ -103,8 +103,7 @@ NS_METHOD macro_class::UnregisterProc(nsIComponentManager *aCompMgr, nsIFile *aP nsresult rv; \ nsCOMPtr catman = do_GetService("@mozilla.org/categorymanager;1", &rv); \ if (NS_FAILED(rv)) return rv; \ - nsXPIDLCString prevEntry; \ - rv = catman->DeleteCategoryEntry(COMMAND_LINE_ARGUMENT_HANDLERS, macro_contractid, PR_TRUE, getter_Copies(prevEntry)); \ + rv = catman->DeleteCategoryEntry(COMMAND_LINE_ARGUMENT_HANDLERS, macro_contractid, PR_TRUE); \ return NS_OK; \ } diff --git a/mozilla/xpfe/appshell/src/nsPreloader.cpp b/mozilla/xpfe/appshell/src/nsPreloader.cpp index 3e03e23ad17..ee145ded59e 100644 --- a/mozilla/xpfe/appshell/src/nsPreloader.cpp +++ b/mozilla/xpfe/appshell/src/nsPreloader.cpp @@ -135,7 +135,7 @@ nsPreloader::UnregisterProc(nsIComponentManager *aCompMgr, rv = catman->DeleteCategoryEntry(COMMAND_LINE_ARGUMENT_HANDLERS, NS_PRELOADER_CONTRACTID, - PR_TRUE, nsnull); + PR_TRUE); // unregister well-known services? diff --git a/mozilla/xpfe/components/build/nsModule.cpp b/mozilla/xpfe/components/build/nsModule.cpp index f15a8bd2a40..39622493d8e 100644 --- a/mozilla/xpfe/components/build/nsModule.cpp +++ b/mozilla/xpfe/components/build/nsModule.cpp @@ -91,9 +91,8 @@ UnregisterProc(nsIComponentManager *aCompMgr, nsCOMPtr catman = do_GetService(NS_CATEGORYMANAGER_CONTRACTID, &rv); if (NS_FAILED(rv)) return rv; - nsXPIDLCString prevEntry; - rv = catman->DeleteCategoryEntry("Gecko-Content-Viewers", "application/http-index-format", PR_TRUE, - getter_Copies(prevEntry)); + rv = catman->DeleteCategoryEntry("Gecko-Content-Viewers", + "application/http-index-format", PR_TRUE); return NS_OK; } diff --git a/mozilla/xpfe/components/startup/public/nsICmdLineHandler.idl b/mozilla/xpfe/components/startup/public/nsICmdLineHandler.idl index b40d34015e6..f5567e6525f 100644 --- a/mozilla/xpfe/components/startup/public/nsICmdLineHandler.idl +++ b/mozilla/xpfe/components/startup/public/nsICmdLineHandler.idl @@ -103,8 +103,7 @@ NS_METHOD macro_class::UnregisterProc(nsIComponentManager *aCompMgr, nsIFile *aP nsresult rv; \ nsCOMPtr catman = do_GetService("@mozilla.org/categorymanager;1", &rv); \ if (NS_FAILED(rv)) return rv; \ - nsXPIDLCString prevEntry; \ - rv = catman->DeleteCategoryEntry(COMMAND_LINE_ARGUMENT_HANDLERS, macro_contractid, PR_TRUE, getter_Copies(prevEntry)); \ + rv = catman->DeleteCategoryEntry(COMMAND_LINE_ARGUMENT_HANDLERS, macro_contractid, PR_TRUE); \ return NS_OK; \ }