--- a/toolkit/xre/nsAppRunner.cpp
+++ b/toolkit/xre/nsAppRunner.cpp
@@ -1156,24 +1156,23 @@ nsXULAppInfo::SetEnabled(bool aEnabled)
nsCOMPtr<nsIFile> xreBinDirectory = do_QueryInterface(greBinDir);
if (!xreBinDirectory) {
return NS_ERROR_FAILURE;
}
return CrashReporter::SetExceptionHandler(xreBinDirectory, true);
}
- else {
- if (!CrashReporter::GetEnabled()) {
- // no point in erroring for double-disabling
- return NS_OK;
- }
-
- return CrashReporter::UnsetExceptionHandler();
+
+ if (!CrashReporter::GetEnabled()) {
+ // no point in erroring for double-disabling
+ return NS_OK;
}
+
+ return CrashReporter::UnsetExceptionHandler();
}
NS_IMETHODIMP
nsXULAppInfo::GetServerURL(nsIURL** aServerURL)
{
if (!CrashReporter::GetEnabled())
return NS_ERROR_NOT_INITIALIZED;
@@ -1700,17 +1699,18 @@ ParseRemoteCommandLine(nsCString& progra
return REMOTE_NOT_FOUND;
}
const char *temp = nullptr;
ar = CheckArg("a", true, &temp);
if (ar == ARG_BAD) {
PR_fprintf(PR_STDERR, "Error: argument -a requires an application name\n");
return REMOTE_ARG_BAD;
- } else if (ar == ARG_FOUND) {
+ }
+ if (ar == ARG_FOUND) {
program.Assign(temp);
}
ar = CheckArg("u", true, username);
if (ar == ARG_BAD) {
PR_fprintf(PR_STDERR, "Error: argument -u requires a username\n");
return REMOTE_ARG_BAD;
}
@@ -2219,25 +2219,27 @@ SelectProfile(nsIProfileLock* *aResult,
SaveToEnv("MOZ_RESET_PROFILE_RESTART=");
}
// reset-profile and migration args need to be checked before any profiles are chosen below.
ar = CheckArg("reset-profile", true);
if (ar == ARG_BAD) {
PR_fprintf(PR_STDERR, "Error: argument --reset-profile is invalid when argument --osint is specified\n");
return NS_ERROR_FAILURE;
- } else if (ar == ARG_FOUND) {
+ }
+ if (ar == ARG_FOUND) {
gDoProfileReset = true;
}
ar = CheckArg("migration", true);
if (ar == ARG_BAD) {
PR_fprintf(PR_STDERR, "Error: argument --migration is invalid when argument --osint is specified\n");
return NS_ERROR_FAILURE;
- } else if (ar == ARG_FOUND) {
+ }
+ if (ar == ARG_FOUND) {
gDoMigration = true;
}
nsCOMPtr<nsIFile> lf = GetFileFromEnv("XRE_PROFILE_PATH");
if (lf) {
nsCOMPtr<nsIFile> localDir =
GetFileFromEnv("XRE_PROFILE_LOCAL_PATH");
if (!localDir) {
@@ -2439,17 +2441,18 @@ SelectProfile(nsIProfileLock* *aResult,
return ShowProfileManager(aProfileSvc, aNative);
}
}
ar = CheckArg("profilemanager", true);
if (ar == ARG_BAD) {
PR_fprintf(PR_STDERR, "Error: argument --profilemanager is invalid when argument --osint is specified\n");
return NS_ERROR_FAILURE;
- } else if (ar == ARG_FOUND && CanShowProfileManager()) {
+ }
+ if (ar == ARG_FOUND && CanShowProfileManager()) {
return ShowProfileManager(aProfileSvc, aNative);
}
#ifndef MOZ_DEV_EDITION
// If the only existing profile is the dev-edition-profile and this is not
// Developer Edition, then no valid profiles were found.
if (count == 1) {
nsCOMPtr<nsIToolkitProfile> deProfile;
@@ -2914,19 +2917,21 @@ const char* DetectDisplay(void)
tryWayland = true;
if (strstr(backend, "broadway"))
tryBroadway = true;
}
const char *display_name;
if (tryX11 && (display_name = PR_GetEnv("DISPLAY"))) {
return display_name;
- } else if (tryWayland && (display_name = PR_GetEnv("WAYLAND_DISPLAY"))) {
+ }
+ if (tryWayland && (display_name = PR_GetEnv("WAYLAND_DISPLAY"))) {
return display_name;
- } else if (tryBroadway && (display_name = PR_GetEnv("BROADWAY_DISPLAY"))) {
+ }
+ if (tryBroadway && (display_name = PR_GetEnv("BROADWAY_DISPLAY"))) {
return display_name;
}
PR_fprintf(PR_STDERR, "Error: GDK_BACKEND does not match available displays\n");
return nullptr;
}
#endif // MOZ_WIDGET_GTK
@@ -3150,17 +3155,17 @@ XREMain::XRE_mainInit(bool* aExitFlag)
// Check for application.ini overrides
const char* override = nullptr;
ar = CheckArg("override", true, &override);
if (ar == ARG_BAD) {
Output(true, "Incorrect number of arguments passed to --override");
return 1;
}
- else if (ar == ARG_FOUND) {
+ if (ar == ARG_FOUND) {
nsCOMPtr<nsIFile> overrideLF;
rv = XRE_GetFileFromPath(override, getter_AddRefs(overrideLF));
if (NS_FAILED(rv)) {
Output(true, "Error: unrecognized override.ini path.\n");
return 1;
}
rv = XRE_ParseAppData(overrideLF, *mAppData);
@@ -3376,17 +3381,18 @@ XREMain::XRE_mainInit(bool* aExitFlag)
// unset the env variable
SaveToEnv("MOZ_SAFE_MODE_RESTART=");
}
ar = CheckArg("safe-mode", true);
if (ar == ARG_BAD) {
PR_fprintf(PR_STDERR, "Error: argument --safe-mode is invalid when argument --osint is specified\n");
return 1;
- } else if (ar == ARG_FOUND) {
+ }
+ if (ar == ARG_FOUND) {
gSafeMode = true;
}
#ifdef XP_WIN
// If the shift key is pressed and the ctrl and / or alt keys are not pressed
// during startup start in safe mode. GetKeyState returns a short and the high
// order bit will be 1 if the key is pressed. By masking the returned short
// with 0x8000 the result will be 0 if the key is not pressed and non-zero
@@ -3459,25 +3465,27 @@ XREMain::XRE_mainInit(bool* aExitFlag)
// Handle --no-remote and --new-instance command line arguments. Setup
// the environment to better accommodate other components and various
// restart scenarios.
ar = CheckArg("no-remote", true);
if (ar == ARG_BAD) {
PR_fprintf(PR_STDERR, "Error: argument --no-remote is invalid when argument --osint is specified\n");
return 1;
- } else if (ar == ARG_FOUND) {
+ }
+ if (ar == ARG_FOUND) {
SaveToEnv("MOZ_NO_REMOTE=1");
}
ar = CheckArg("new-instance", true);
if (ar == ARG_BAD) {
PR_fprintf(PR_STDERR, "Error: argument --new-instance is invalid when argument --osint is specified\n");
return 1;
- } else if (ar == ARG_FOUND) {
+ }
+ if (ar == ARG_FOUND) {
SaveToEnv("MOZ_NEW_INSTANCE=1");
}
// Handle --help and --version command line arguments.
// They should return quickly, so we deal with them here.
if (CheckArg("h") || CheckArg("help") || CheckArg("?")) {
DumpHelp();
*aExitFlag = true;
@@ -3493,17 +3501,18 @@ XREMain::XRE_mainInit(bool* aExitFlag)
rv = XRE_InitCommandLine(gArgc, gArgv);
NS_ENSURE_SUCCESS(rv, 1);
// Check for --register, which registers chrome and then exits immediately.
ar = CheckArg("register", true);
if (ar == ARG_BAD) {
PR_fprintf(PR_STDERR, "Error: argument --register is invalid when argument --osint is specified\n");
return 1;
- } else if (ar == ARG_FOUND) {
+ }
+ if (ar == ARG_FOUND) {
ScopedXPCOMStartup xpcom;
rv = xpcom.Initialize();
NS_ENSURE_SUCCESS(rv, 1);
{
nsCOMPtr<nsIChromeRegistry> chromeReg =
mozilla::services::GetChromeRegistryService();
NS_ENSURE_TRUE(chromeReg, 1);
@@ -3838,17 +3847,18 @@ XREMain::XRE_mainStartup(bool* aExitFlag
// Try to remote the entire command line. If this fails, start up normally.
const char* desktopStartupIDPtr =
mDesktopStartupID.IsEmpty() ? nullptr : mDesktopStartupID.get();
rr = StartRemoteClient(desktopStartupIDPtr, program, profile, username);
if (rr == REMOTE_FOUND) {
*aExitFlag = true;
return 0;
- } else if (rr == REMOTE_ARG_BAD) {
+ }
+ if (rr == REMOTE_ARG_BAD) {
return 1;
}
}
#endif
#if defined(MOZ_WIDGET_GTK)
g_set_application_name(mAppData->name);
gtk_window_set_auto_startup_notification(false);