From 1211a81aad18bbc4d9e8fb9973238ad8e7e1f688 Mon Sep 17 00:00:00 2001 From: M Stoeckl Date: Sun, 20 Jan 2019 13:51:12 -0500 Subject: Replace wlr_log with sway_log This commit mostly duplicates the wlr_log functions, although with a sway_* prefix. (This is very similar to PR #2009.) However, the logging function no longer needs to be replaceable, so sway_log_init's second argument is used to set the exit callback for sway_abort. wlr_log_init is still invoked in sway/main.c This commit makes it easier to remove the wlroots dependency for the helper programs swaymsg, swaybg, swaybar, and swaynag. --- sway/commands/output/background.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'sway/commands/output/background.c') diff --git a/sway/commands/output/background.c b/sway/commands/output/background.c index 00038e67..affa04ea 100644 --- a/sway/commands/output/background.c +++ b/sway/commands/output/background.c @@ -79,7 +79,7 @@ struct cmd_results *output_cmd_background(int argc, char **argv) { src = join_args(p.we_wordv, p.we_wordc); wordfree(&p); if (!src) { - wlr_log(WLR_ERROR, "Failed to duplicate string"); + sway_log(SWAY_ERROR, "Failed to duplicate string"); return cmd_results_new(CMD_FAILURE, "Unable to allocate resource"); } @@ -88,7 +88,7 @@ struct cmd_results *output_cmd_background(int argc, char **argv) { char *conf = strdup(config->current_config_path); if (!conf) { - wlr_log(WLR_ERROR, "Failed to duplicate string"); + sway_log(SWAY_ERROR, "Failed to duplicate string"); free(src); return cmd_results_new(CMD_FAILURE, "Unable to allocate resources"); @@ -100,7 +100,7 @@ struct cmd_results *output_cmd_background(int argc, char **argv) { if (!src) { free(rel_path); free(conf); - wlr_log(WLR_ERROR, "Unable to allocate memory"); + sway_log(SWAY_ERROR, "Unable to allocate memory"); return cmd_results_new(CMD_FAILURE, "Unable to allocate resources"); } @@ -112,7 +112,7 @@ struct cmd_results *output_cmd_background(int argc, char **argv) { bool can_access = access(src, F_OK) != -1; if (!can_access) { - wlr_log(WLR_ERROR, "Unable to access background file '%s': %s", + sway_log(SWAY_ERROR, "Unable to access background file '%s': %s", src, strerror(errno)); config_add_swaynag_warning("Unable to access background file '%s'", src); -- cgit v1.2.3-54-g00ecf