aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorEric Engestrom <eric@engestrom.ch>2016-05-02 15:10:22 +0100
committerEric Engestrom <eric@engestrom.ch>2016-05-02 18:30:04 +0100
commitcc9d1cacbb79ce9a54f2c8505a25f4ace7d74c46 (patch)
treebb62675e504f73e2a1c1f71727256ae5f8e5bfa1 /include
parent8a6b64e47109db52c74d0347ac7659e94a352ae6 (diff)
common: refactor sway_log()
This removes most preprocessor logic, leaving it only it the header.
Diffstat (limited to 'include')
-rw-r--r--include/log.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/log.h b/include/log.h
index 268783f4..efacf90f 100644
--- a/include/log.h
+++ b/include/log.h
@@ -22,14 +22,14 @@ bool _sway_assert(bool condition, const char* format, ...) __attribute__((format
#define sway_assert(COND, FMT, ...) \
_sway_assert(COND, "%s:" FMT, __PRETTY_FUNCTION__, ##__VA_ARGS__)
-#ifndef NDEBUG
void _sway_log(const char *filename, int line, log_importance_t verbosity, const char* format, ...) __attribute__((format(printf,4,5)));
+
+#ifndef NDEBUG
#define sway_log(VERBOSITY, FMT, ...) \
_sway_log(__FILE__, __LINE__, VERBOSITY, FMT, ##__VA_ARGS__)
#else
-void _sway_log(log_importance_t verbosity, const char* format, ...) __attribute__((format(printf,2,3)));
#define sway_log(VERBOSITY, FMT, ...) \
- _sway_log(VERBOSITY, FMT, ##__VA_ARGS__)
+ _sway_log(NULL, 0, VERBOSITY, FMT, ##__VA_ARGS__)
#endif
void error_handler(int sig);