diff options
author | nicm <nicm> | 2014-03-31 21:42:45 +0000 |
---|---|---|
committer | nicm <nicm> | 2014-03-31 21:42:45 +0000 |
commit | 48478ea0a990cc14d61722f9f8d3f1490d8f417a (patch) | |
tree | df43e4a2b0e6902ebe725687cde171a7b6365e45 /log.c | |
parent | 7bdb675469336e1c8c7c5039aff369f8245dc450 (diff) |
Remove log_debug2 as well and simplify log.c.
Diffstat (limited to 'log.c')
-rw-r--r-- | log.c | 77 |
1 files changed, 21 insertions, 56 deletions
@@ -22,20 +22,13 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> -#include <syslog.h> -#include <time.h> #include "tmux.h" -/* Log file, if needed. */ -FILE *log_file; +FILE *log_file; -/* Debug level. */ -int log_level = 0; - -void log_event_cb(int, const char *); -void log_vwrite(const char *, va_list); -__dead void log_vfatal(const char *, va_list); +void log_event_cb(int, const char *); +void log_vwrite(const char *, va_list); /* Log callback for libevent. */ void @@ -46,12 +39,11 @@ log_event_cb(unused int severity, const char *msg) /* Open logging to file. */ void -log_open(int level, const char *path) +log_open(const char *path) { log_file = fopen(path, "w"); if (log_file == NULL) return; - log_level = level; setlinebuf(log_file); event_set_log_callback(log_event_cb); @@ -65,6 +57,7 @@ log_close(void) { if (log_file != NULL) fclose(log_file); + log_file = NULL; event_set_log_callback(NULL); } @@ -92,63 +85,35 @@ log_debug(const char *msg, ...) { va_list ap; - if (log_level > 0) { - va_start(ap, msg); - log_vwrite(msg, ap); - va_end(ap); - } -} - -/* Log a debug message at level 2. */ -void printflike1 -log_debug2(const char *msg, ...) -{ - va_list ap; - - if (log_level > 1) { - va_start(ap, msg); - log_vwrite(msg, ap); - va_end(ap); - } -} - -/* Log a critical error, with error string if necessary, and die. */ -__dead void -log_vfatal(const char *msg, va_list ap) -{ - char *fmt; - - if (errno != 0) { - if (asprintf(&fmt, "fatal: %s: %s", msg, strerror(errno)) == -1) - exit(1); - log_vwrite(fmt, ap); - } else { - if (asprintf(&fmt, "fatal: %s", msg) == -1) - exit(1); - log_vwrite(fmt, ap); - } - free(fmt); - - exit(1); + va_start(ap, msg); + log_vwrite(msg, ap); + va_end(ap); } -/* Log a critical error, with error string, and die. */ +/* Log a critical error with error string and die. */ __dead void printflike1 log_fatal(const char *msg, ...) { - va_list ap; + char *fmt; + va_list ap; va_start(ap, msg); - log_vfatal(msg, ap); + if (asprintf(&fmt, "fatal: %s: %s", msg, strerror(errno)) == -1) + exit(1); + log_vwrite(fmt, ap); + exit(1); } /* Log a critical error and die. */ __dead void printflike1 log_fatalx(const char *msg, ...) { - va_list ap; + char *fmt; + va_list ap; - errno = 0; va_start(ap, msg); - log_vfatal(msg, ap); + if (asprintf(&fmt, "fatal: %s", msg) == -1) + exit(1); + log_vwrite(fmt, ap); + exit(1); } |