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/swaynag.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'sway/swaynag.c') 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, if (swaynag->detailed) { if (pipe(swaynag->fd) != 0) { - wlr_log(WLR_ERROR, "Failed to create pipe for swaynag"); + sway_log(SWAY_ERROR, "Failed to create pipe for swaynag"); return false; } fcntl(swaynag->fd[1], F_SETFD, FD_CLOEXEC); @@ -37,7 +37,7 @@ bool swaynag_spawn(const char *swaynag_command, execl("/bin/sh", "/bin/sh", "-c", cmd, NULL); _exit(0); } else if (pid < 0) { - wlr_log(WLR_ERROR, "Failed to create fork for swaynag"); + sway_log(SWAY_ERROR, "Failed to create fork for swaynag"); if (swaynag->detailed) { close(swaynag->fd[0]); close(swaynag->fd[1]); @@ -67,7 +67,7 @@ void swaynag_log(const char *swaynag_command, struct swaynag_instance *swaynag, } if (!swaynag->detailed) { - wlr_log(WLR_ERROR, "Attempting to write to non-detailed swaynag inst"); + sway_log(SWAY_ERROR, "Attempting to write to non-detailed swaynag inst"); return; } @@ -82,7 +82,7 @@ void swaynag_log(const char *swaynag_command, struct swaynag_instance *swaynag, char *temp = malloc(length + 1); if (!temp) { - wlr_log(WLR_ERROR, "Failed to allocate buffer for swaynag log entry."); + sway_log(SWAY_ERROR, "Failed to allocate buffer for swaynag log entry."); return; } -- cgit v1.2.3-54-g00ecf