Remove log_debug2 as well and simplify log.c.

This commit is contained in:
Nicholas Marriott 2014-03-07 16:05:29 +00:00
parent c5a30513ed
commit b1a87b2ee4
4 changed files with 26 additions and 62 deletions

View File

@ -142,7 +142,7 @@ input_key(struct window_pane *wp, int key)
char *out; char *out;
u_char ch; u_char ch;
log_debug2("writing key 0x%x", key); log_debug("writing key 0x%x", key);
/* /*
* If this is a normal 7-bit key, just send it, with a leading escape * If this is a normal 7-bit key, just send it, with a leading escape
@ -185,11 +185,11 @@ input_key(struct window_pane *wp, int key)
break; break;
} }
if (i == nitems(input_keys)) { if (i == nitems(input_keys)) {
log_debug2("key 0x%x missing", key); log_debug("key 0x%x missing", key);
return; return;
} }
dlen = strlen(ike->data); dlen = strlen(ike->data);
log_debug2("found key 0x%x: \"%s\"", key, ike->data); log_debug("found key 0x%x: \"%s\"", key, ike->data);
/* Prefix a \033 for escape. */ /* Prefix a \033 for escape. */
if (key & KEYC_ESCAPE) if (key & KEYC_ESCAPE)

61
log.c
View File

@ -22,20 +22,13 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <syslog.h>
#include <time.h>
#include "tmux.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_event_cb(int, const char *);
void log_vwrite(const char *, va_list); void log_vwrite(const char *, va_list);
__dead void log_vfatal(const char *, va_list);
/* Log callback for libevent. */ /* Log callback for libevent. */
void void
@ -46,12 +39,11 @@ log_event_cb(unused int severity, const char *msg)
/* Open logging to file. */ /* Open logging to file. */
void void
log_open(int level, const char *path) log_open(const char *path)
{ {
log_file = fopen(path, "w"); log_file = fopen(path, "w");
if (log_file == NULL) if (log_file == NULL)
return; return;
log_level = level;
setlinebuf(log_file); setlinebuf(log_file);
event_set_log_callback(log_event_cb); event_set_log_callback(log_event_cb);
@ -65,6 +57,7 @@ log_close(void)
{ {
if (log_file != NULL) if (log_file != NULL)
fclose(log_file); fclose(log_file);
log_file = NULL;
event_set_log_callback(NULL); event_set_log_callback(NULL);
} }
@ -92,63 +85,35 @@ log_debug(const char *msg, ...)
{ {
va_list ap; va_list ap;
if (log_level > 0) {
va_start(ap, msg); va_start(ap, msg);
log_vwrite(msg, ap); log_vwrite(msg, ap);
va_end(ap); va_end(ap);
} }
}
/* Log a debug message at level 2. */ /* Log a critical error with error string and die. */
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);
}
/* Log a critical error, with error string, and die. */
__dead void printflike1 __dead void printflike1
log_fatal(const char *msg, ...) log_fatal(const char *msg, ...)
{ {
char *fmt;
va_list ap; va_list ap;
va_start(ap, msg); 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. */ /* Log a critical error and die. */
__dead void printflike1 __dead void printflike1
log_fatalx(const char *msg, ...) log_fatalx(const char *msg, ...)
{ {
char *fmt;
va_list ap; va_list ap;
errno = 0;
va_start(ap, msg); va_start(ap, msg);
log_vfatal(msg, ap); if (asprintf(&fmt, "fatal: %s", msg) == -1)
exit(1);
log_vwrite(fmt, ap);
exit(1);
} }

2
tmux.c
View File

@ -73,7 +73,7 @@ logfile(const char *name)
if (debug_level > 0) { if (debug_level > 0) {
xasprintf(&path, "tmux-%s-%ld.log", name, (long) getpid()); xasprintf(&path, "tmux-%s-%ld.log", name, (long) getpid());
log_open(debug_level, path); log_open(path);
free(path); free(path);
} }
} }

3
tmux.h
View File

@ -2330,10 +2330,9 @@ char *osdep_get_cwd(int);
struct event_base *osdep_event_init(void); struct event_base *osdep_event_init(void);
/* log.c */ /* log.c */
void log_open(int, const char *); void log_open(const char *);
void log_close(void); void log_close(void);
void printflike1 log_debug(const char *, ...); void printflike1 log_debug(const char *, ...);
void printflike1 log_debug2(const char *, ...);
__dead void printflike1 log_fatal(const char *, ...); __dead void printflike1 log_fatal(const char *, ...);
__dead void printflike1 log_fatalx(const char *, ...); __dead void printflike1 log_fatalx(const char *, ...);