diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/render/gles2.h | 2 | ||||
| -rw-r--r-- | include/wlr/util/log.h | 33 |
2 files changed, 18 insertions, 17 deletions
diff --git a/include/render/gles2.h b/include/render/gles2.h index 67d4e9f5..8b036f80 100644 --- a/include/render/gles2.h +++ b/include/render/gles2.h @@ -93,7 +93,7 @@ struct wlr_gles2_texture *get_gles2_texture_in_context( void push_gles2_marker(const char *file, const char *func); void pop_gles2_marker(void); -#define PUSH_GLES2_DEBUG push_gles2_marker(wlr_strip_path(__FILE__), __func__) +#define PUSH_GLES2_DEBUG push_gles2_marker(_wlr_strip_path(__FILE__), __func__) #define POP_GLES2_DEBUG pop_gles2_marker() #endif diff --git a/include/wlr/util/log.h b/include/wlr/util/log.h index 5528664b..098a020d 100644 --- a/include/wlr/util/log.h +++ b/include/wlr/util/log.h @@ -6,35 +6,36 @@ #include <string.h> #include <errno.h> -typedef enum { - L_SILENT = 0, - L_ERROR = 1, - L_INFO = 2, - L_DEBUG = 3, - L_LAST, -} log_importance_t; +enum wlr_log_importance { + WLR_SILENT = 0, + WLR_ERROR = 1, + WLR_INFO = 2, + WLR_DEBUG = 3, + WLR_LOG_IMPORTANCE_LAST, +}; -typedef void (*log_callback_t)(log_importance_t importance, const char *fmt, va_list args); +typedef void (*wlr_log_func_t)(enum wlr_log_importance importance, + const char *fmt, va_list args); // Will log all messages less than or equal to `verbosity` // If `callback` is NULL, wlr will use its default logger. -void wlr_log_init(log_importance_t verbosity, log_callback_t callback); +void wlr_log_init(enum wlr_log_importance verbosity, wlr_log_func_t callback); #ifdef __GNUC__ -#define ATTRIB_PRINTF(start, end) __attribute__((format(printf, start, end))) +#define _WLR_ATTRIB_PRINTF(start, end) __attribute__((format(printf, start, end))) #else -#define ATTRIB_PRINTF(start, end) +#define _WLR_ATTRIB_PRINTF(start, end) #endif -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 *wlr_strip_path(const char *filepath); +void _wlr_log(enum wlr_log_importance verbosity, const char *format, ...) _WLR_ATTRIB_PRINTF(2, 3); +void _wlr_vlog(enum wlr_log_importance verbosity, const char *format, va_list args) _WLR_ATTRIB_PRINTF(2, 0); +const char *_wlr_strip_path(const char *filepath); #define wlr_log(verb, fmt, ...) \ - _wlr_log(verb, "[%s:%d] " fmt, wlr_strip_path(__FILE__), __LINE__, ##__VA_ARGS__) + _wlr_log(verb, "[%s:%d] " fmt, _wlr_strip_path(__FILE__), __LINE__, ##__VA_ARGS__) #define wlr_vlog(verb, fmt, args) \ - _wlr_vlog(verb, "[%s:%d] " fmt, wlr_strip_path(__FILE__), __LINE__, args) + _wlr_vlog(verb, "[%s:%d] " fmt, _wlr_strip_path(__FILE__), __LINE__, args) #define wlr_log_errno(verb, fmt, ...) \ wlr_log(verb, fmt ": %s", ##__VA_ARGS__, strerror(errno)) |