diff --git a/log.c b/log.c index e3e231c7..51ad2f52 100644 --- a/log.c +++ b/log.c @@ -1,4 +1,4 @@ -/* $Id: log.c,v 1.12 2009-05-13 23:27:00 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,17 +39,8 @@ FILE *log_file; /* Debug level. */ int log_level; -/* Open logging to syslog. */ -void -log_open_syslog(int level) -{ - log_type = LOG_TYPE_SYSLOG; - log_level = level; - - openlog(__progname, LOG_PID|LOG_NDELAY, LOG_FACILITY); - - tzset(); -} +void log_vwrite(int, const char *, va_list); +__dead void log_vfatal(const char *, va_list); /* Open logging to tty. */ void diff --git a/tmux.h b/tmux.h index 7f74175d..8a75191d 100644 --- a/tmux.h +++ b/tmux.h @@ -1,4 +1,4 @@ -/* $OpenBSD: tmux.h,v 1.12 2009/06/25 06:15:04 nicm Exp $ */ +/* $OpenBSD: tmux.h,v 1.13 2009/06/25 06:23:10 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott @@ -1658,20 +1658,15 @@ uint8_t buffer_read8(struct buffer *); int buffer_poll(struct pollfd *, struct buffer *, struct buffer *); /* log.c */ -#define LOG_FACILITY LOG_DAEMON -void log_open_syslog(int); void log_open_tty(int); void log_open_file(int, const char *); void log_close(void); -void log_vwrite(int, const char *, va_list); -void log_write(int, const char *, ...); void printflike1 log_warn(const char *, ...); void printflike1 log_warnx(const char *, ...); void printflike1 log_info(const char *, ...); void printflike1 log_debug(const char *, ...); void printflike1 log_debug2(const char *, ...); void printflike1 log_debug3(const char *, ...); -__dead void log_vfatal(const char *, va_list); __dead void log_fatal(const char *, ...); __dead void log_fatalx(const char *, ...);