diff options
author | M Stoeckl <code@mstoeckl.com> | 2019-01-20 13:51:12 -0500 |
---|---|---|
committer | emersion <contact@emersion.fr> | 2019-01-21 12:59:42 +0100 |
commit | 1211a81aad18bbc4d9e8fb9973238ad8e7e1f688 (patch) | |
tree | 5c3f60e0219cb8b4a1b7cafb760a871661866e32 /sway/commands/exec_always.c | |
parent | Log libinput_config_status errors (diff) | |
download | sway-1211a81aad18bbc4d9e8fb9973238ad8e7e1f688.tar.gz sway-1211a81aad18bbc4d9e8fb9973238ad8e7e1f688.tar.zst sway-1211a81aad18bbc4d9e8fb9973238ad8e7e1f688.zip |
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.
Diffstat (limited to 'sway/commands/exec_always.c')
-rw-r--r-- | sway/commands/exec_always.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sway/commands/exec_always.c b/sway/commands/exec_always.c index 1ed6c7e6..a5724295 100644 --- a/sway/commands/exec_always.c +++ b/sway/commands/exec_always.c | |||
@@ -24,7 +24,7 @@ struct cmd_results *cmd_exec_always(int argc, char **argv) { | |||
24 | 24 | ||
25 | char *tmp = NULL; | 25 | char *tmp = NULL; |
26 | if (strcmp(argv[0], "--no-startup-id") == 0) { | 26 | if (strcmp(argv[0], "--no-startup-id") == 0) { |
27 | wlr_log(WLR_INFO, "exec switch '--no-startup-id' not supported, ignored."); | 27 | sway_log(SWAY_INFO, "exec switch '--no-startup-id' not supported, ignored."); |
28 | --argc; ++argv; | 28 | --argc; ++argv; |
29 | if ((error = checkarg(argc, argv[-1], EXPECTED_AT_LEAST, 1))) { | 29 | if ((error = checkarg(argc, argv[-1], EXPECTED_AT_LEAST, 1))) { |
30 | return error; | 30 | return error; |
@@ -43,11 +43,11 @@ struct cmd_results *cmd_exec_always(int argc, char **argv) { | |||
43 | strncpy(cmd, tmp, sizeof(cmd) - 1); | 43 | strncpy(cmd, tmp, sizeof(cmd) - 1); |
44 | cmd[sizeof(cmd) - 1] = 0; | 44 | cmd[sizeof(cmd) - 1] = 0; |
45 | free(tmp); | 45 | free(tmp); |
46 | wlr_log(WLR_DEBUG, "Executing %s", cmd); | 46 | sway_log(SWAY_DEBUG, "Executing %s", cmd); |
47 | 47 | ||
48 | int fd[2]; | 48 | int fd[2]; |
49 | if (pipe(fd) != 0) { | 49 | if (pipe(fd) != 0) { |
50 | wlr_log(WLR_ERROR, "Unable to create pipe for fork"); | 50 | sway_log(SWAY_ERROR, "Unable to create pipe for fork"); |
51 | } | 51 | } |
52 | 52 | ||
53 | pid_t pid, child; | 53 | pid_t pid, child; |
@@ -84,7 +84,7 @@ struct cmd_results *cmd_exec_always(int argc, char **argv) { | |||
84 | // cleanup child process | 84 | // cleanup child process |
85 | waitpid(pid, NULL, 0); | 85 | waitpid(pid, NULL, 0); |
86 | if (child > 0) { | 86 | if (child > 0) { |
87 | wlr_log(WLR_DEBUG, "Child process created with pid %d", child); | 87 | sway_log(SWAY_DEBUG, "Child process created with pid %d", child); |
88 | root_record_workspace_pid(child); | 88 | root_record_workspace_pid(child); |
89 | } else { | 89 | } else { |
90 | return cmd_results_new(CMD_FAILURE, "Second fork() failed"); | 90 | return cmd_results_new(CMD_FAILURE, "Second fork() failed"); |