зеркало из https://github.com/mozilla/gecko-dev.git
fixing bustage
This commit is contained in:
Родитель
75e4e74da2
Коммит
fbf5a1a1ed
|
@ -815,18 +815,18 @@ static nsresult main1(int argc, char* argv[], nsISupports *nativeApp )
|
||||||
nsAppFileLocationProvider* appFileLocProvider;
|
nsAppFileLocationProvider* appFileLocProvider;
|
||||||
appFileLocProvider = new nsAppFileLocationProvider;
|
appFileLocProvider = new nsAppFileLocationProvider;
|
||||||
if (!appFileLocProvider) {
|
if (!appFileLocProvider) {
|
||||||
NS_ASSERTION(FALSE, "Could not create nsAppFileLocationProvider\n");
|
NS_ASSERTION(PR_FALSE, "Could not create nsAppFileLocationProvider\n");
|
||||||
return NS_ERROR_OUT_OF_MEMORY;
|
return NS_ERROR_OUT_OF_MEMORY;
|
||||||
}
|
}
|
||||||
NS_WITH_SERVICE(nsIDirectoryService, directoryService, NS_DIRECTORY_SERVICE_PROGID, &rv);
|
NS_WITH_SERVICE(nsIDirectoryService, directoryService, NS_DIRECTORY_SERVICE_PROGID, &rv);
|
||||||
if (!directoryService) {
|
if (!directoryService) {
|
||||||
NS_ASSERTION(FALSE, "failed to get directory service");
|
NS_ASSERTION(PR_FALSE, "failed to get directory service");
|
||||||
return rv;
|
return rv;
|
||||||
}
|
}
|
||||||
// RegisterProvider will AddRef it and own it - notice we have not AddRef'd it
|
// RegisterProvider will AddRef it and own it - notice we have not AddRef'd it
|
||||||
rv = directoryService->RegisterProvider(appFileLocProvider);
|
rv = directoryService->RegisterProvider(appFileLocProvider);
|
||||||
if (NS_FAILED(rv)) {
|
if (NS_FAILED(rv)) {
|
||||||
NS_ASSERTION(FALSE, "Could not register directory service provider\n");
|
NS_ASSERTION(PR_FALSE, "Could not register directory service provider\n");
|
||||||
return rv;
|
return rv;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -835,7 +835,7 @@ static nsresult main1(int argc, char* argv[], nsISupports *nativeApp )
|
||||||
NS_ASSERTION(NS_SUCCEEDED(rv), "failed to get command line service");
|
NS_ASSERTION(NS_SUCCEEDED(rv), "failed to get command line service");
|
||||||
|
|
||||||
if (NS_FAILED(rv)) {
|
if (NS_FAILED(rv)) {
|
||||||
NS_ASSERTION(FALSE, "Could not obtain CmdLine processing service\n");
|
NS_ASSERTION(PR_FALSE, "Could not obtain CmdLine processing service\n");
|
||||||
return rv;
|
return rv;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче