Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

r=chak, sr=vidur, a=tor. 82000. removing unused arg from nsICategoryManager.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@96452 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
valeski%netscape.com 2001-06-05 21:25:57 +00:00
parent 9e57e6cb8a
commit b75b28be35
13 changed files with 18 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mozilla/embedding/browser/build/nsWebBrowserModule.cpp
View File

@ -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

5
mozilla/extensions/cookie/nsCookieHTTPNotify.cpp
View File

@ -85,9 +85,8 @@ NS_METHOD nsCookieHTTPNotify::UnregisterProc(nsIComponentManager *aCompMgr,
nsCOMPtr<nsICategoryManager> 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;

4
mozilla/extensions/p3p/src/nsP3PService.cpp
View File

@ -128,7 +128,6 @@ nsP3PService::CategoryUnregister( nsIComponentManager *aComponentManage
nsCOMPtr<nsICategoryManager> 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;

2
mozilla/js/jsd/jsd_xpc.cpp
View File

@ -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;
}

3
mozilla/js/src/xpconnect/loader/mozJSComponentLoader.cpp
View File

@ -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;
}

2
mozilla/modules/libpref/src/nsPrefsFactory.cpp
View File

@ -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;
}

10
mozilla/netwerk/build/nsNetModule.cpp
View File

@ -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;

5
mozilla/xpcom/components/nsCategoryManager.cpp
View File

@ -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

3
mozilla/xpcom/components/nsICategoryManager.idl
View File

@ -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);
/**

3
mozilla/xpfe/appshell/public/nsICmdLineHandler.idl
View File

@ -103,8 +103,7 @@ NS_METHOD macro_class::UnregisterProc(nsIComponentManager *aCompMgr, nsIFile *aP
nsresult rv; \
nsCOMPtr<nsICategoryManager> 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; \
}

2
mozilla/xpfe/appshell/src/nsPreloader.cpp
View File

@ -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?

5
mozilla/xpfe/components/build/nsModule.cpp
View File

@ -91,9 +91,8 @@ UnregisterProc(nsIComponentManager *aCompMgr,
nsCOMPtr<nsICategoryManager> 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;
}

3
mozilla/xpfe/components/startup/public/nsICmdLineHandler.idl
View File

@ -103,8 +103,7 @@ NS_METHOD macro_class::UnregisterProc(nsIComponentManager *aCompMgr, nsIFile *aP
nsresult rv; \
nsCOMPtr<nsICategoryManager> 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; \
}