mirrors
/
sway
mirror of https://github.com/swaywm/sway.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1175 from JerziKaminsky/fix_sway_assert_variadic 

Fix multiple issues in sway_assert
This commit is contained in:
Drew DeVault 2017-04-16 09:50:50 -04:00 committed by GitHub
parent 4b3e533a59 709b53bd43
commit edb8075ae0
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
common/log.c
View File

@ -63,7 +63,8 @@ void sway_abort(const char *format, ...) {
sway_terminate(EXIT_FAILURE);
}
void _sway_log(const char *filename, int line, log_importance_t verbosity, const char* format, ...) {
void _sway_vlog(const char *filename, int line, log_importance_t verbosity,
const char *format, va_list args) {
if (verbosity <= v) {
// prefix the time to the log message
static struct tm result;
@ -99,10 +100,7 @@ void _sway_log(const char *filename, int line, log_importance_t verbosity, const
fprintf(stderr, "[%s:%d] ", file, line);
}
va_list args;
va_start(args, format);
vfprintf(stderr, format, args);
va_end(args);
if (colored && isatty(STDERR_FILENO)) {
fprintf(stderr, "\x1B[0m");
@ -111,6 +109,13 @@ void _sway_log(const char *filename, int line, log_importance_t verbosity, const
}
}
void _sway_log(const char *filename, int line, log_importance_t verbosity, const char* format, ...) {
va_list args;
va_start(args, format);
_sway_vlog(filename, line, verbosity, format, args);
va_end(args);
}
void sway_log_errno(log_importance_t verbosity, char* format, ...) {
if (verbosity <= v) {
unsigned int c = verbosity;
@ -137,14 +142,14 @@ void sway_log_errno(log_importance_t verbosity, char* format, ...) {
}
}
bool _sway_assert(bool condition, const char* format, ...) {
bool _sway_assert(bool condition, const char *filename, int line, const char* format, ...) {
if (condition) {
return true;
}
va_list args;
va_start(args, format);
sway_log(L_ERROR, format, args);
_sway_vlog(filename, line, L_ERROR, format, args);
va_end(args);
#ifndef NDEBUG

7
include/log.h
View File

@ -19,15 +19,18 @@ void sway_log_colors(int mode);
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)));
bool _sway_assert(bool condition, const char* format, ...) __attribute__((format(printf,2,3)));
bool _sway_assert(bool condition, const char *filename, int line, const char* format, ...) __attribute__((format(printf,4,5)));
#define sway_assert(COND, FMT, ...) \
_sway_assert(COND, "%s:" FMT, __PRETTY_FUNCTION__, ##__VA_ARGS__)
_sway_assert(COND, __FILE__, __LINE__, "%s:" FMT, __PRETTY_FUNCTION__, ##__VA_ARGS__)
void _sway_log(const char *filename, int line, log_importance_t verbosity, const char* format, ...) __attribute__((format(printf,4,5)));
#define sway_log(VERBOSITY, FMT, ...) \
_sway_log(__FILE__, __LINE__, VERBOSITY, FMT, ##__VA_ARGS__)
#define sway_vlog(VERBOSITY, FMT, VA_ARGS) \
_sway_vlog(__FILE__, __LINE__, VERBOSITY, FMT, VA_ARGS)
void error_handler(int sig);
#endif