mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-22 07:51:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make sway_abort() report location

Browse source
This commit is contained in:
Jerzi Kaminsky 2017-04-20 19:13:53 +03:00
parent 974be01e83
commit 8ecb490679
2 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
common/log.c
View file

@ -53,16 +53,6 @@ void sway_log_colors(int mode) {
colored = (mode == 1) ? 1 : 0; colored = (mode == 1) ? 1 : 0;
} }
void sway_abort(const char *format, ...) {
fprintf(stderr, "ERROR: ");
va_list args;
va_start(args, format);
vfprintf(stderr, format, args);
va_end(args);
fprintf(stderr, "\n");
sway_terminate(EXIT_FAILURE);
}
void _sway_vlog(const char *filename, int line, log_importance_t verbosity, void _sway_vlog(const char *filename, int line, log_importance_t verbosity,
const char *format, va_list args) { const char *format, va_list args) {
if (verbosity <= v) { if (verbosity <= v) {
@ -116,6 +106,15 @@ void _sway_log(const char *filename, int line, log_importance_t verbosity, const
va_end(args); va_end(args);
} }
void _sway_abort(const char *filename, int line, const char* format, ...) {
va_list args;
va_start(args, format);
_sway_vlog(filename, line, L_ERROR, format, args);
va_end(args);
sway_terminate(EXIT_FAILURE);
}
void sway_log_errno(log_importance_t verbosity, char* format, ...) { void sway_log_errno(log_importance_t verbosity, char* format, ...) {
if (verbosity <= v) { if (verbosity <= v) {
unsigned int c = verbosity; unsigned int c = verbosity;

5
include/log.h
View file

@ -17,7 +17,10 @@ void reset_log_level(void);
bool toggle_debug_logging(void); bool toggle_debug_logging(void);
void sway_log_colors(int mode); void sway_log_colors(int mode);
void sway_log_errno(log_importance_t verbosity, char* format, ...) __attribute__((format(printf,2,3))); void sway_log_errno(log_importance_t verbosity, char* format, ...) __attribute__((format(printf,2,3)));
void sway_abort(const char* format, ...) __attribute__((format(printf,1,2)));
void _sway_abort(const char *filename, int line, const char* format, ...) __attribute__((format(printf,3,4)));
#define sway_abort(FMT, ...) \
_sway_abort(__FILE__, __LINE__, FMT, ##__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 *filename, int line, const char* format, ...) __attribute__((format(printf,4,5)));
#define sway_assert(COND, FMT, ...) \ #define sway_assert(COND, FMT, ...) \