mirror of
https://github.com/swaywm/sway.git
synced 2024-11-22 07:51:28 +00:00
swaynag: remove redundant status variables in main
Instead, we just use `status` for all failures.
This commit is contained in:
parent
20729a6a5e
commit
78758ef369
|
@ -20,7 +20,7 @@ void sway_terminate(int code) {
|
||||||
}
|
}
|
||||||
|
|
||||||
int main(int argc, char **argv) {
|
int main(int argc, char **argv) {
|
||||||
int exit_code = EXIT_SUCCESS;
|
int status = EXIT_SUCCESS;
|
||||||
|
|
||||||
list_t *types = create_list();
|
list_t *types = create_list();
|
||||||
swaynag_types_add_default(types);
|
swaynag_types_add_default(types);
|
||||||
|
@ -31,10 +31,9 @@ int main(int argc, char **argv) {
|
||||||
|
|
||||||
char *config_path = NULL;
|
char *config_path = NULL;
|
||||||
bool debug = false;
|
bool debug = false;
|
||||||
int launch_status = swaynag_parse_options(argc, argv, NULL, NULL, NULL,
|
status = swaynag_parse_options(argc, argv, NULL, NULL, NULL,
|
||||||
&config_path, &debug);
|
&config_path, &debug);
|
||||||
if (launch_status != 0) {
|
if (status != 0) {
|
||||||
exit_code = launch_status;
|
|
||||||
goto cleanup;
|
goto cleanup;
|
||||||
}
|
}
|
||||||
sway_log_init(debug ? SWAY_DEBUG : SWAY_ERROR, NULL);
|
sway_log_init(debug ? SWAY_DEBUG : SWAY_ERROR, NULL);
|
||||||
|
@ -44,10 +43,8 @@ int main(int argc, char **argv) {
|
||||||
}
|
}
|
||||||
if (config_path) {
|
if (config_path) {
|
||||||
sway_log(SWAY_DEBUG, "Loading config file: %s", config_path);
|
sway_log(SWAY_DEBUG, "Loading config file: %s", config_path);
|
||||||
int config_status = swaynag_load_config(config_path, &swaynag, types);
|
status = swaynag_load_config(config_path, &swaynag, types);
|
||||||
free(config_path);
|
if (status != 0) {
|
||||||
if (config_status != 0) {
|
|
||||||
exit_code = config_status;
|
|
||||||
goto cleanup;
|
goto cleanup;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -59,17 +56,16 @@ int main(int argc, char **argv) {
|
||||||
struct swaynag_type *type_args = swaynag_type_new("<args>");
|
struct swaynag_type *type_args = swaynag_type_new("<args>");
|
||||||
list_add(types, type_args);
|
list_add(types, type_args);
|
||||||
|
|
||||||
int result = swaynag_parse_options(argc, argv, &swaynag, types,
|
status = swaynag_parse_options(argc, argv, &swaynag, types,
|
||||||
type_args, NULL, NULL);
|
type_args, NULL, NULL);
|
||||||
if (result != 0) {
|
if (status != 0) {
|
||||||
exit_code = result;
|
|
||||||
goto cleanup;
|
goto cleanup;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!swaynag.message) {
|
if (!swaynag.message) {
|
||||||
sway_log(SWAY_ERROR, "No message passed. Please provide --message/-m");
|
sway_log(SWAY_ERROR, "No message passed. Please provide --message/-m");
|
||||||
exit_code = EXIT_FAILURE;
|
status = EXIT_FAILURE;
|
||||||
goto cleanup;
|
goto cleanup;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -113,11 +109,11 @@ int main(int argc, char **argv) {
|
||||||
|
|
||||||
swaynag_setup(&swaynag);
|
swaynag_setup(&swaynag);
|
||||||
swaynag_run(&swaynag);
|
swaynag_run(&swaynag);
|
||||||
return exit_code;
|
return status;
|
||||||
|
|
||||||
cleanup:
|
cleanup:
|
||||||
swaynag_types_free(types);
|
swaynag_types_free(types);
|
||||||
free(swaynag.details.button_details.text);
|
free(swaynag.details.button_details.text);
|
||||||
swaynag_destroy(&swaynag);
|
swaynag_destroy(&swaynag);
|
||||||
return exit_code;
|
return status;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue