diff options
author | Drew DeVault <sir@cmpwn.com> | 2017-04-20 13:00:56 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-20 13:00:56 -0400 |
commit | d2de52209e2391fce8b9e146ab32b16302756e10 (patch) | |
tree | 6f09e8f2374eada5b031c3c1957caafafdfb0250 /include | |
parent | Merge pull request #1183 from sleep-walker/master (diff) | |
parent | Merge branch 'master' into logging2 (diff) | |
download | sway-d2de52209e2391fce8b9e146ab32b16302756e10.tar.gz sway-d2de52209e2391fce8b9e146ab32b16302756e10.tar.zst sway-d2de52209e2391fce8b9e146ab32b16302756e10.zip |
Merge pull request #1184 from JerziKaminsky/logging2
More Logging Fixes
Diffstat (limited to 'include')
-rw-r--r-- | include/log.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/log.h b/include/log.h index 32981b62..a1e33fa2 100644 --- a/include/log.h +++ b/include/log.h | |||
@@ -17,7 +17,10 @@ void reset_log_level(void); | |||
17 | bool toggle_debug_logging(void); | 17 | bool toggle_debug_logging(void); |
18 | void sway_log_colors(int mode); | 18 | void sway_log_colors(int mode); |
19 | void sway_log_errno(log_importance_t verbosity, char* format, ...) __attribute__((format(printf,2,3))); | 19 | void sway_log_errno(log_importance_t verbosity, char* format, ...) __attribute__((format(printf,2,3))); |
20 | void sway_abort(const char* format, ...) __attribute__((format(printf,1,2))); | 20 | |
21 | void _sway_abort(const char *filename, int line, const char* format, ...) __attribute__((format(printf,3,4))); | ||
22 | #define sway_abort(FMT, ...) \ | ||
23 | _sway_abort(__FILE__, __LINE__, FMT, ##__VA_ARGS__) | ||
21 | 24 | ||
22 | bool _sway_assert(bool condition, const char *filename, int line, const char* format, ...) __attribute__((format(printf,4,5))); | 25 | bool _sway_assert(bool condition, const char *filename, int line, const char* format, ...) __attribute__((format(printf,4,5))); |
23 | #define sway_assert(COND, FMT, ...) \ | 26 | #define sway_assert(COND, FMT, ...) \ |