diff options
| author | Dominique Martinet <asmadeus@codewreck.org> | 2018-01-05 23:36:32 +0100 |
|---|---|---|
| committer | Dominique Martinet <asmadeus@codewreck.org> | 2018-01-05 23:40:09 +0100 |
| commit | d4ddfec32e15fd1f47568f1b82eacc27cda5266a (patch) | |
| tree | 79386d3d2aa90718f8c071a3337c695cb8a71f78 /include | |
| parent | 51f6718581ab7e21fd7a8d50450586f3969781ab (diff) | |
| download | sway-d4ddfec32e15fd1f47568f1b82eacc27cda5266a.tar.xz | |
common/log: finish removing most log functions
Keep sway_abort and sway_assert and convert them to use wlr_log
functions
Diffstat (limited to 'include')
| -rw-r--r-- | include/log.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/log.h b/include/log.h index 646776f5..350a59ef 100644 --- a/include/log.h +++ b/include/log.h @@ -3,13 +3,13 @@ #include <stdbool.h> #include <wlr/util/log.h> -void _sway_abort(const char *filename, int line, const char* format, ...) __attribute__((format(printf,3,4))); +void _sway_abort(const char *filename, ...) ATTRIB_PRINTF(1, 2); #define sway_abort(FMT, ...) \ - _sway_abort(__FILE__, __LINE__, FMT, ##__VA_ARGS__) + _sway_abort("[%s:%d] " FMT, _strip_path(__FILE__), __LINE__, ##__VA_ARGS__) -bool _sway_assert(bool condition, const char *filename, int line, const char* format, ...) __attribute__((format(printf,4,5))); +bool _sway_assert(bool condition, const char* format, ...) ATTRIB_PRINTF(2, 3); #define sway_assert(COND, FMT, ...) \ - _sway_assert(COND, __FILE__, __LINE__, "%s:" FMT, __PRETTY_FUNCTION__, ##__VA_ARGS__) + _sway_assert(COND, "[%s:%d] %s:" FMT, _strip_path(__FILE__), __LINE__, __PRETTY_FUNCTION__, ##__VA_ARGS__) void error_handler(int sig); |