Reorganize wlr-common

4 files changed, 42 insertions, 22 deletions

diff --git a/include/wlr/common/log.h b/include/wlr/common/log.h
deleted file mode 100644
index c93f9652..00000000
--- a/include/wlr/common/log.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#ifndef _WLR_COMMON_LOG_H
-#define _WLR_COMMON_LOG_H
-#include <stdbool.h>
-#include <stdarg.h>
-
-typedef enum {
-	L_SILENT = 0,
-	L_ERROR = 1,
-	L_INFO = 2,
-	L_DEBUG = 3,
-	L_LAST,
-} log_importance_t;
-
-typedef void (*log_callback_t)(log_importance_t importance, const char *fmt, va_list args);
-
-void wlr_init_log(log_callback_t callback);
-void wlr_log_stderr(log_importance_t verbosity, const char *fmt, va_list args);
-
-#endif
diff --git a/include/wlr/types/wlr_output.h b/include/wlr/types/wlr_output.h
index 66216d3e..8ccf87e1 100644
--- a/include/wlr/types/wlr_output.h
+++ b/include/wlr/types/wlr_output.h
@@ -1,7 +1,7 @@
 #ifndef _WLR_TYPES_OUTPUT_H
 #define _WLR_TYPES_OUTPUT_H
 #include <wayland-server.h>
-#include <wlr/common/list.h>
+#include <wlr/util/list.h>
 #include <stdbool.h>
 
 struct wlr_output_mode_state;
diff --git a/include/wlr/common/list.h b/include/wlr/util/list.h
index 2bc82570..c82fbf7a 100644
--- a/include/wlr/common/list.h
+++ b/include/wlr/util/list.h
@@ -1,5 +1,5 @@
-#ifndef _WLR_LIST_H
-#define _WLR_LIST_H
+#ifndef _WLR_UTIL_LIST_H
+#define _WLR_UTIL_LIST_H
 
 #include <stddef.h>
 
diff --git a/include/wlr/util/log.h b/include/wlr/util/log.h
new file mode 100644
index 00000000..2acaa2ed
--- /dev/null
+++ b/include/wlr/util/log.h
@@ -0,0 +1,39 @@
+#ifndef _WLR_UTIL_LOG_H
+#define _WLR_UTIL_LOG_H
+#include <stdbool.h>
+#include <stdarg.h>
+#include <string.h>
+#include <errno.h>
+
+typedef enum {
+	L_SILENT = 0,
+	L_ERROR = 1,
+	L_INFO = 2,
+	L_DEBUG = 3,
+	L_LAST,
+} log_importance_t;
+
+typedef void (*log_callback_t)(log_importance_t importance, const char *fmt, va_list args);
+
+void wlr_init_log(log_callback_t callback);
+
+#ifdef __GNUC__
+#define ATTRIB_PRINTF(start, end) __attribute__((format(printf, start, end)))
+#else
+#define ATTRIB_PRINTF(start, end)
+#endif
+
+void _wlr_log(log_importance_t verbosity, const char *format, ...) ATTRIB_PRINTF(2, 3);
+void _wlr_vlog(log_importance_t verbosity, const char *format, va_list args) ATTRIB_PRINTF(2, 0);
+const char *_strip_path(const char *filepath);
+
+#define wlr_log(verb, fmt, ...) \
+	_wlr_log(verb, "[%s:%d] " fmt, _strip_path(__FILE__), __LINE__, ##__VA_ARGS__)
+
+#define wlr_vlog(verb, fmt, args) \
+	_wlr_vlog(verb, "[%s:%d] " fmt, _strip_path(__FILE__), __LINE__, args)
+
+#define wlr_log_errno(verb, fmt, ...) \
+	wlr_log(verb, fmt ": %s", ##__VA_ARGS__, strerror(errno))
+
+#endif