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 /swaymsg/main.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 'swaymsg/main.c')
-rw-r--r-- | swaymsg/main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/swaymsg/main.c b/swaymsg/main.c index e5eee631..2b49f9b9 100644 --- a/swaymsg/main.c +++ b/swaymsg/main.c | |||
@@ -317,7 +317,7 @@ int main(int argc, char **argv) { | |||
317 | char *socket_path = NULL; | 317 | char *socket_path = NULL; |
318 | char *cmdtype = NULL; | 318 | char *cmdtype = NULL; |
319 | 319 | ||
320 | wlr_log_init(WLR_INFO, NULL); | 320 | sway_log_init(SWAY_INFO, NULL); |
321 | 321 | ||
322 | static struct option long_options[] = { | 322 | static struct option long_options[] = { |
323 | {"help", no_argument, NULL, 'h'}, | 323 | {"help", no_argument, NULL, 'h'}, |
@@ -421,7 +421,7 @@ int main(int argc, char **argv) { | |||
421 | free(cmdtype); | 421 | free(cmdtype); |
422 | 422 | ||
423 | if (monitor && type != IPC_SUBSCRIBE) { | 423 | if (monitor && type != IPC_SUBSCRIBE) { |
424 | wlr_log(WLR_ERROR, "Monitor can only be used with -t SUBSCRIBE"); | 424 | sway_log(SWAY_ERROR, "Monitor can only be used with -t SUBSCRIBE"); |
425 | free(socket_path); | 425 | free(socket_path); |
426 | return 1; | 426 | return 1; |
427 | } | 427 | } |