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 /common/loop.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 'common/loop.c')
-rw-r--r-- | common/loop.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/common/loop.c b/common/loop.c index 295f3a30..aecad2f3 100644 --- a/common/loop.c +++ b/common/loop.c | |||
@@ -34,7 +34,7 @@ struct loop { | |||
34 | struct loop *loop_create(void) { | 34 | struct loop *loop_create(void) { |
35 | struct loop *loop = calloc(1, sizeof(struct loop)); | 35 | struct loop *loop = calloc(1, sizeof(struct loop)); |
36 | if (!loop) { | 36 | if (!loop) { |
37 | wlr_log(WLR_ERROR, "Unable to allocate memory for loop"); | 37 | sway_log(SWAY_ERROR, "Unable to allocate memory for loop"); |
38 | return NULL; | 38 | return NULL; |
39 | } | 39 | } |
40 | loop->fd_capacity = 10; | 40 | loop->fd_capacity = 10; |
@@ -107,7 +107,7 @@ void loop_add_fd(struct loop *loop, int fd, short mask, | |||
107 | void (*callback)(int fd, short mask, void *data), void *data) { | 107 | void (*callback)(int fd, short mask, void *data), void *data) { |
108 | struct loop_fd_event *event = calloc(1, sizeof(struct loop_fd_event)); | 108 | struct loop_fd_event *event = calloc(1, sizeof(struct loop_fd_event)); |
109 | if (!event) { | 109 | if (!event) { |
110 | wlr_log(WLR_ERROR, "Unable to allocate memory for event"); | 110 | sway_log(SWAY_ERROR, "Unable to allocate memory for event"); |
111 | return; | 111 | return; |
112 | } | 112 | } |
113 | event->callback = callback; | 113 | event->callback = callback; |
@@ -129,7 +129,7 @@ struct loop_timer *loop_add_timer(struct loop *loop, int ms, | |||
129 | void (*callback)(void *data), void *data) { | 129 | void (*callback)(void *data), void *data) { |
130 | struct loop_timer *timer = calloc(1, sizeof(struct loop_timer)); | 130 | struct loop_timer *timer = calloc(1, sizeof(struct loop_timer)); |
131 | if (!timer) { | 131 | if (!timer) { |
132 | wlr_log(WLR_ERROR, "Unable to allocate memory for timer"); | 132 | sway_log(SWAY_ERROR, "Unable to allocate memory for timer"); |
133 | return NULL; | 133 | return NULL; |
134 | } | 134 | } |
135 | timer->callback = callback; | 135 | timer->callback = callback; |