libi3: Introduce LOG

diff --git a/include/libi3.h b/include/libi3.h
index 7b58b96f947903f56e2f00448f2c7e773c4ab5f0..45ba970f5ba88729a3f09944736d5388ce953ce9 100644 (file)
--- a/include/libi3.h
+++ b/include/libi3.h
@@ -68,8 +68,11 @@ struct Font {
 
 /* Since this file also gets included by utilities which don’t use the i3 log
  * infrastructure, we define a fallback. */
+#if !defined(LOG)
+#define LOG(fmt, ...) fprintf(stdout, "[libi3] " __FILE__ " " fmt, ##__VA_ARGS__)
+#endif
 #if !defined(ELOG)
-#define ELOG(fmt, ...) fprintf(stderr, "ERROR: " fmt, ##__VA_ARGS__)
+#define ELOG(fmt, ...) fprintf(stderr, "[libi3] ERROR: " fmt, ##__VA_ARGS__)
 #endif
 
 /**

diff --git a/include/log.h b/include/log.h
index 26e85f042ee2ebab2d00160dcc6d9cc825517b20..7822fba50f66b9ba51943e2eef62776bfc3e799d 100644 (file)
--- a/include/log.h
+++ b/include/log.h
@@ -13,14 +13,17 @@
 #include <stdarg.h>
 #include <stdbool.h>
 
-/** ##__VA_ARGS__ means: leave out __VA_ARGS__ completely if it is empty, that
-   is, delete the preceding comma */
-#define LOG(fmt, ...) verboselog(fmt, ##__VA_ARGS__)
-/* We will include libi3.h which define its own version of ELOG.
+/* We will include libi3.h which define its own version of LOG, ELOG.
  * We want *our* version, so we undef the libi3 one. */
+#if defined(LOG)
+#undef LOG
+#endif
 #if defined(ELOG)
 #undef ELOG
 #endif
+/** ##__VA_ARGS__ means: leave out __VA_ARGS__ completely if it is empty, that
+   is, delete the preceding comma */
+#define LOG(fmt, ...) verboselog(fmt, ##__VA_ARGS__)
 #define ELOG(fmt, ...) errorlog("ERROR: " fmt, ##__VA_ARGS__)
 #define DLOG(fmt, ...) debuglog("%s:%s:%d - " fmt, I3__FILE__, __FUNCTION__, __LINE__, ##__VA_ARGS__)