common/log: finish removing most log functions

Keep sway_abort and sway_assert and convert them to use wlr_log
functions

2 files changed, 8 insertions, 149 deletions

diff --git a/common/log.c b/common/log.c
index c47b4eea..2cc7289c 100644
--- a/common/log.c
+++ b/common/log.c
@@ -1,167 +1,26 @@
-#define _POSIX_C_SOURCE 199506L
-#include <errno.h>
-#include <libgen.h>
 #include <signal.h>
 #include <stdarg.h>
-#include <stdio.h>
 #include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <time.h>
 #include "log.h"
-#include "readline.h"
-
-static int colored = 1;
-static log_importance_t loglevel_default = L_ERROR;
-static log_importance_t v = L_SILENT;
-
-static const char *verbosity_colors[] = {
-	[L_SILENT] = "",
-	[L_ERROR ] = "\x1B[1;31m",
-	[L_INFO  ] = "\x1B[1;34m",
-	[L_DEBUG ] = "\x1B[1;30m",
-};
-static const char verbosity_chars[] = {
-	[L_SILENT] = '\0',
-	[L_ERROR ] = 'E',
-	[L_INFO  ] = 'I',
-	[L_DEBUG ] = 'D',
-};
-
-void init_log(log_importance_t verbosity) {
-	if (verbosity != L_DEBUG) {
-		// command "debuglog" needs to know the user specified log level when
-		// turning off debug logging.
-		loglevel_default = verbosity;
-	}
-	v = verbosity;
-}
-
-void set_log_level(log_importance_t verbosity) {
-	v = verbosity;
-}
-
-log_importance_t get_log_level(void) {
-	return v;
-}
-
-void reset_log_level(void) {
-	v = loglevel_default;
-}
-
-bool toggle_debug_logging(void) {
-	v = (v == L_DEBUG) ? loglevel_default : L_DEBUG;
-	return (v == L_DEBUG);
-}
-
-void sway_log_colors(int mode) {
-	colored = (mode == 1) ? 1 : 0;
-}
-
-void _sway_vlog(const char *filename, int line, log_importance_t verbosity,
-		const char *format, va_list args) {
-	if (verbosity <= v) {
-		// prefix the time to the log message
-		static struct tm result;
-		static time_t t;
-		static struct tm *tm_info;
-		char buffer[26];
-
-		unsigned int c = verbosity;
-		if (c > sizeof(verbosity_colors) / sizeof(char *) - 1) {
-			c = sizeof(verbosity_colors) / sizeof(char *) - 1;
-		}
-
-		// First, if not printing color, show the log level
-		if (!(colored && isatty(STDERR_FILENO)) && c != L_SILENT) {
-			fprintf(stderr, "%c: ", verbosity_chars[c]);
-		}
-
-		// get current time
-		t = time(NULL);
-		// convert time to local time (determined by the locale)
-		tm_info = localtime_r(&t, &result);
-		// generate time prefix
-		strftime(buffer, sizeof(buffer), "%x %X - ", tm_info);
-		fprintf(stderr, "%s", buffer);
-
-		if (colored && isatty(STDERR_FILENO)) {
-			fprintf(stderr, "%s", verbosity_colors[c]);
-		}
-
-		if (filename && line) {
-			const char *file = filename + strlen(filename);
-			while (file != filename && *file != '/') {
-				--file;
-			}
-			if (*file == '/') {
-				++file;
-			}
-			fprintf(stderr, "[%s:%d] ", file, line);
-		}
-
-		vfprintf(stderr, format, args);
-
-		if (colored && isatty(STDERR_FILENO)) {
-			fprintf(stderr, "\x1B[0m");
-		}
-		fprintf(stderr, "\n");
-	}
-}
-
-void _sway_log(const char *filename, int line, log_importance_t verbosity, const char* format, ...) {
-	va_list args;
-	va_start(args, format);
-	_sway_vlog(filename, line, verbosity, format, args);
-	va_end(args);
-}
 
 void sway_terminate(int code);
 
-void _sway_abort(const char *filename, int line, const char* format, ...) {
+void _sway_abort(const char *format, ...) {
 	va_list args;
 	va_start(args, format);
-	_sway_vlog(filename, line, L_ERROR, format, args);
+	_wlr_vlog(L_ERROR, format, args);
 	va_end(args);
 	sway_terminate(EXIT_FAILURE);
 }
 
-void sway_log_errno(log_importance_t verbosity, char* format, ...) {
-	if (verbosity <= v) {
-		unsigned int c = verbosity;
-		if (c > sizeof(verbosity_colors) / sizeof(char *) - 1) {
-			c = sizeof(verbosity_colors) / sizeof(char *) - 1;
-		}
-
-		if (colored && isatty(STDERR_FILENO)) {
-			fprintf(stderr, "%s", verbosity_colors[c]);
-		} else if (c != L_SILENT) {
-			fprintf(stderr, "%c: ", verbosity_chars[c]);
-		}
-
-		va_list args;
-		va_start(args, format);
-		vfprintf(stderr, format, args);
-		va_end(args);
-
-		fprintf(stderr, ": ");
-		fprintf(stderr, "%s", strerror(errno));
-
-		if (colored && isatty(STDERR_FILENO)) {
-			fprintf(stderr, "\x1B[0m");
-		}
-		fprintf(stderr, "\n");
-	}
-}
-
-bool _sway_assert(bool condition, const char *filename, int line, const char* format, ...) {
+bool _sway_assert(bool condition, const char *format, ...) {
 	if (condition) {
 		return true;
 	}
 
 	va_list args;
 	va_start(args, format);
-	_sway_vlog(filename, line, L_ERROR, format, args);
+	_wlr_vlog(L_ERROR, format, args);
 	va_end(args);
 
 #ifndef NDEBUG
diff --git a/include/log.h b/include/log.h
index 646776f5..350a59ef 100644
--- a/include/log.h
+++ b/include/log.h
@@ -3,13 +3,13 @@
 #include <stdbool.h>
 #include <wlr/util/log.h>
 
-void _sway_abort(const char *filename, int line, const char* format, ...) __attribute__((format(printf,3,4)));
+void _sway_abort(const char *filename, ...) ATTRIB_PRINTF(1, 2);
 #define sway_abort(FMT, ...) \
-    _sway_abort(__FILE__, __LINE__, FMT, ##__VA_ARGS__)
+    _sway_abort("[%s:%d] " FMT, _strip_path(__FILE__), __LINE__, ##__VA_ARGS__)
 
-bool _sway_assert(bool condition, const char *filename, int line, const char* format, ...) __attribute__((format(printf,4,5)));
+bool _sway_assert(bool condition, const char* format, ...) ATTRIB_PRINTF(2, 3);
 #define sway_assert(COND, FMT, ...) \
-	_sway_assert(COND, __FILE__, __LINE__, "%s:" FMT, __PRETTY_FUNCTION__, ##__VA_ARGS__)
+	_sway_assert(COND, "[%s:%d] %s:" FMT, _strip_path(__FILE__), __LINE__, __PRETTY_FUNCTION__, ##__VA_ARGS__)
 
 void error_handler(int sig);