nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

libi3: Introduce LOG

This commit is contained in:
Quentin Glidic 2012-08-12 12:20:15 +02:00
parent 6ff3f7abad
commit 9f7247fd9c
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/libi3.h
View File

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

11
include/log.h
View File

@ -13,14 +13,17 @@
#include <stdarg.h> #include <stdarg.h>
#include <stdbool.h> #include <stdbool.h>
/** ##__VA_ARGS__ means: leave out __VA_ARGS__ completely if it is empty, that /* We will include libi3.h which define its own version of LOG, ELOG.
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 want *our* version, so we undef the libi3 one. */ * We want *our* version, so we undef the libi3 one. */
#if defined(LOG)
#undef LOG
#endif
#if defined(ELOG) #if defined(ELOG)
#undef ELOG #undef ELOG
#endif #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 ELOG(fmt, ...) errorlog("ERROR: " fmt, ##__VA_ARGS__)
#define DLOG(fmt, ...) debuglog("%s:%s:%d - " fmt, I3__FILE__, __FUNCTION__, __LINE__, ##__VA_ARGS__) #define DLOG(fmt, ...) debuglog("%s:%s:%d - " fmt, I3__FILE__, __FUNCTION__, __LINE__, ##__VA_ARGS__)