=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/log.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- src/usr.bin/tmux/log.c 2009/06/01 22:58:49 1.1 +++ src/usr.bin/tmux/log.c 2009/06/25 06:23:10 1.2 @@ -1,4 +1,4 @@ -/* $OpenBSD: log.c,v 1.1 2009/06/01 22:58:49 nicm Exp $ */ +/* $OpenBSD: log.c,v 1.2 2009/06/25 06:23:10 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott @@ -29,9 +29,8 @@ /* Logging type. */ #define LOG_TYPE_OFF 0 -#define LOG_TYPE_SYSLOG 1 -#define LOG_TYPE_TTY 2 -#define LOG_TYPE_FILE 3 +#define LOG_TYPE_TTY 1 +#define LOG_TYPE_FILE 2 int log_type = LOG_TYPE_OFF; /* Log file, if needed. */ @@ -40,18 +39,9 @@ /* Debug level. */ int log_level; -/* Open logging to syslog. */ -void -log_open_syslog(int level) -{ - log_type = LOG_TYPE_SYSLOG; - log_level = level; +void log_vwrite(int, const char *, va_list); +__dead void log_vfatal(const char *, va_list); - openlog(__progname, LOG_PID|LOG_NDELAY, LOG_FACILITY); - - tzset(); -} - /* Open logging to tty. */ void log_open_tty(int level) @@ -93,26 +83,12 @@ /* Write a log message. */ void -log_write(int pri, const char *msg, ...) -{ - va_list ap; - - va_start(ap, msg); - log_vwrite(pri, msg, ap); - va_end(ap); -} - -/* Write a log message. */ -void log_vwrite(int pri, const char *msg, va_list ap) { char *fmt; FILE *f = log_file; switch (log_type) { - case LOG_TYPE_SYSLOG: - vsyslog(pri, msg, ap); - break; case LOG_TYPE_TTY: if (pri == LOG_INFO) f = stdout;