mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2026-05-03 06:46:26 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

introduce sway_log functions

Browse source 
Introduce the sway_log functions as equivalents of the wlr_log
functions. This is a first step to free clients from the wlroots
dependency and allows to use the sway source path for file path
stripping which should get nicer __FILE__ cleans.
This commit is contained in:
Markus Ongyerth 2018-05-24 21:43:56 +02:00
parent 3c77f066a5
commit 1185a8cc1f
3 changed files with 113 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

29
include/log.h
View file

@ -1,16 +1,39 @@
#ifndef _SWAY_LOG_H
#define _SWAY_LOG_H
#include <stdbool.h>
#include <wlr/util/log.h>
#include <stdbool.h>
#include <stdarg.h>
#include <string.h>
#include <errno.h>
void _sway_abort(const char *filename, ...) ATTRIB_PRINTF(1, 2);
#define sway_abort(FMT, ...) \
_sway_abort("[%s:%d] " FMT, wlr_strip_path(__FILE__), __LINE__, ##__VA_ARGS__)
_sway_abort("[%s:%d] " FMT, sway_strip_path(__FILE__), __LINE__, ##__VA_ARGS__)
bool _sway_assert(bool condition, const char* format, ...) ATTRIB_PRINTF(2, 3);
#define sway_assert(COND, FMT, ...) \
_sway_assert(COND, "[%s:%d] %s:" FMT, wlr_strip_path(__FILE__), __LINE__, __PRETTY_FUNCTION__, ##__VA_ARGS__)
_sway_assert(COND, "[%s:%d] %s:" FMT, sway_strip_path(__FILE__), __LINE__, __PRETTY_FUNCTION__, ##__VA_ARGS__)
void error_handler(int sig);
typedef void (*log_callback_t)(log_importance_t importance, const char *fmt, va_list args);
// Will log all messages less than or equal to `verbosity`
// If `callback` is NULL, sway will use its default logger.
void sway_log_init(log_importance_t verbosity, log_callback_t callback);
void _sway_log(log_importance_t verbosity, const char *format, ...) ATTRIB_PRINTF(2, 3);
void _sway_vlog(log_importance_t verbosity, const char *format, va_list args) ATTRIB_PRINTF(2, 0);
const char *sway_strip_path(const char *filepath);
#define sway_log(verb, fmt, ...) \
_sway_log(verb, "[%s:%d] " fmt, sway_strip_path(__FILE__), __LINE__, ##__VA_ARGS__)
#define sway_vlog(verb, fmt, args) \
_sway_vlog(verb, "[%s:%d] " fmt, sway_strip_path(__FILE__), __LINE__, args)
#define sway_log_errno(verb, fmt, ...) \
sway_log(verb, fmt ": %s", ##__VA_ARGS__, strerror(errno))
#endif