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/swaynag.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/swaynag.c')
-rw-r--r-- | sway/swaynag.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sway/swaynag.c b/sway/swaynag.c index 38e74b88..49027f5d 100644 --- a/sway/swaynag.c +++ b/sway/swaynag.c | |||
@@ -17,7 +17,7 @@ bool swaynag_spawn(const char *swaynag_command, | |||
17 | 17 | ||
18 | if (swaynag->detailed) { | 18 | if (swaynag->detailed) { |
19 | if (pipe(swaynag->fd) != 0) { | 19 | if (pipe(swaynag->fd) != 0) { |
20 | wlr_log(WLR_ERROR, "Failed to create pipe for swaynag"); | 20 | sway_log(SWAY_ERROR, "Failed to create pipe for swaynag"); |
21 | return false; | 21 | return false; |
22 | } | 22 | } |
23 | fcntl(swaynag->fd[1], F_SETFD, FD_CLOEXEC); | 23 | fcntl(swaynag->fd[1], F_SETFD, FD_CLOEXEC); |
@@ -37,7 +37,7 @@ bool swaynag_spawn(const char *swaynag_command, | |||
37 | execl("/bin/sh", "/bin/sh", "-c", cmd, NULL); | 37 | execl("/bin/sh", "/bin/sh", "-c", cmd, NULL); |
38 | _exit(0); | 38 | _exit(0); |
39 | } else if (pid < 0) { | 39 | } else if (pid < 0) { |
40 | wlr_log(WLR_ERROR, "Failed to create fork for swaynag"); | 40 | sway_log(SWAY_ERROR, "Failed to create fork for swaynag"); |
41 | if (swaynag->detailed) { | 41 | if (swaynag->detailed) { |
42 | close(swaynag->fd[0]); | 42 | close(swaynag->fd[0]); |
43 | close(swaynag->fd[1]); | 43 | close(swaynag->fd[1]); |
@@ -67,7 +67,7 @@ void swaynag_log(const char *swaynag_command, struct swaynag_instance *swaynag, | |||
67 | } | 67 | } |
68 | 68 | ||
69 | if (!swaynag->detailed) { | 69 | if (!swaynag->detailed) { |
70 | wlr_log(WLR_ERROR, "Attempting to write to non-detailed swaynag inst"); | 70 | sway_log(SWAY_ERROR, "Attempting to write to non-detailed swaynag inst"); |
71 | return; | 71 | return; |
72 | } | 72 | } |
73 | 73 | ||
@@ -82,7 +82,7 @@ void swaynag_log(const char *swaynag_command, struct swaynag_instance *swaynag, | |||
82 | 82 | ||
83 | char *temp = malloc(length + 1); | 83 | char *temp = malloc(length + 1); |
84 | if (!temp) { | 84 | if (!temp) { |
85 | wlr_log(WLR_ERROR, "Failed to allocate buffer for swaynag log entry."); | 85 | sway_log(SWAY_ERROR, "Failed to allocate buffer for swaynag log entry."); |
86 | return; | 86 | return; |
87 | } | 87 | } |
88 | 88 | ||