diff options
| author | nyorain <nyorain@gmail.com> | 2017-06-19 20:01:35 +0200 |
|---|---|---|
| committer | nyorain <nyorain@gmail.com> | 2017-06-19 20:01:35 +0200 |
| commit | acbc0a019a8b9a94fb8a7c1c0c226f482504dd68 (patch) | |
| tree | 60e1e691751f711c3eec183357754a34406ce5dd /include | |
| parent | 325a331425c1771d16fa90d099fa33f3ab8772f3 (diff) | |
Make logging ninja friendly
When building with ninja instead of make __FILE__ will be relative
and logging therefore break. This moves stripping the path
from __FILE__ to runtime and handles a relative filepath as
well as a full one.
Diffstat (limited to 'include')
| -rw-r--r-- | include/common/log.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/common/log.h b/include/common/log.h index 3fca0dcf..98e57900 100644 --- a/include/common/log.h +++ b/include/common/log.h @@ -13,12 +13,13 @@ void _wlr_log(log_importance_t verbosity, const char *format, ...) ATTRIB_PRINTF(2, 3); void _wlr_vlog(log_importance_t verbosity, const char *format, va_list args) ATTRIB_PRINTF(2, 0); +const char *_strip_path(const char *filepath); #define wlr_log(verb, fmt, ...) \ - _wlr_log(verb, "[%s:%d] " fmt, __FILE__ + strlen(WLR_SRC_DIR) + 1, __LINE__, ##__VA_ARGS__) + _wlr_log(verb, "[%s:%d] " fmt, _strip_path(__FILE__), __LINE__, ##__VA_ARGS__) #define wlr_vlog(verb, fmt, args) \ - _wlr_vlog(verb, "[%s:%d] " fmt, __FILE__ + strlen(WLR_SRC_DIR) + 1, __LINE__, args) + _wlr_vlog(verb, "[%s:%d] " fmt, _strip_path(__FILE__), __LINE__, args) #define wlr_log_errno(verb, fmt, ...) \ wlr_log(verb, fmt ": %s", ##__VA_ARGS__, strerror(errno)) |