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. --- common/util.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'common/util.c') diff --git a/common/util.c b/common/util.c index d66058a6..27039dcb 100644 --- a/common/util.c +++ b/common/util.c @@ -116,7 +116,7 @@ uint32_t parse_color(const char *color) { int len = strlen(color); if (len != 6 && len != 8) { - wlr_log(WLR_DEBUG, "Invalid color %s, defaulting to color 0xFFFFFFFF", color); + sway_log(SWAY_DEBUG, "Invalid color %s, defaulting to color 0xFFFFFFFF", color); return 0xFFFFFFFF; } uint32_t res = (uint32_t)strtoul(color, NULL, 16); @@ -147,7 +147,7 @@ float parse_float(const char *value) { char *end; float flt = strtof(value, &end); if (*end || errno) { - wlr_log(WLR_DEBUG, "Invalid float value '%s', defaulting to NAN", value); + sway_log(SWAY_DEBUG, "Invalid float value '%s', defaulting to NAN", value); return NAN; } return flt; -- cgit v1.2.3