diff options
author | 2017-04-20 13:00:56 -0400 | |
---|---|---|
committer | 2017-04-20 13:00:56 -0400 | |
commit | d2de52209e2391fce8b9e146ab32b16302756e10 (patch) | |
tree | 6f09e8f2374eada5b031c3c1957caafafdfb0250 /common/log.c | |
parent | Merge pull request #1183 from sleep-walker/master (diff) | |
parent | Merge branch 'master' into logging2 (diff) | |
download | sway-d2de52209e2391fce8b9e146ab32b16302756e10.tar.gz sway-d2de52209e2391fce8b9e146ab32b16302756e10.tar.zst sway-d2de52209e2391fce8b9e146ab32b16302756e10.zip |
Merge pull request #1184 from JerziKaminsky/logging2
More Logging Fixes
Diffstat (limited to 'common/log.c')
-rw-r--r-- | common/log.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/common/log.c b/common/log.c index 8e5b71f9..61937495 100644 --- a/common/log.c +++ b/common/log.c | |||
@@ -53,16 +53,6 @@ void sway_log_colors(int mode) { | |||
53 | colored = (mode == 1) ? 1 : 0; | 53 | colored = (mode == 1) ? 1 : 0; |
54 | } | 54 | } |
55 | 55 | ||
56 | void sway_abort(const char *format, ...) { | ||
57 | fprintf(stderr, "ERROR: "); | ||
58 | va_list args; | ||
59 | va_start(args, format); | ||
60 | vfprintf(stderr, format, args); | ||
61 | va_end(args); | ||
62 | fprintf(stderr, "\n"); | ||
63 | sway_terminate(EXIT_FAILURE); | ||
64 | } | ||
65 | |||
66 | void _sway_vlog(const char *filename, int line, log_importance_t verbosity, | 56 | void _sway_vlog(const char *filename, int line, log_importance_t verbosity, |
67 | const char *format, va_list args) { | 57 | const char *format, va_list args) { |
68 | if (verbosity <= v) { | 58 | if (verbosity <= v) { |
@@ -116,6 +106,15 @@ void _sway_log(const char *filename, int line, log_importance_t verbosity, const | |||
116 | va_end(args); | 106 | va_end(args); |
117 | } | 107 | } |
118 | 108 | ||
109 | |||
110 | void _sway_abort(const char *filename, int line, const char* format, ...) { | ||
111 | va_list args; | ||
112 | va_start(args, format); | ||
113 | _sway_vlog(filename, line, L_ERROR, format, args); | ||
114 | va_end(args); | ||
115 | sway_terminate(EXIT_FAILURE); | ||
116 | } | ||
117 | |||
119 | void sway_log_errno(log_importance_t verbosity, char* format, ...) { | 118 | void sway_log_errno(log_importance_t verbosity, char* format, ...) { |
120 | if (verbosity <= v) { | 119 | if (verbosity <= v) { |
121 | unsigned int c = verbosity; | 120 | unsigned int c = verbosity; |