summaryrefslogtreecommitdiff
path: root/log.c
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2002-02-26 17:52:14 +0000
committerBen Lindstrom <mouring@eviladmin.org>2002-02-26 17:52:14 +0000
commit9c8edc96fcb30cb8a9b0bd87fc1903c6fb618c31 (patch)
tree6629fda33de38709acce44bd39cbd761adcb4270 /log.c
parent351e9196904bdef86d61d51b8890853b219e5d22 (diff)
- markus@cvs.openbsd.org 2002/02/22 12:20:34
[log.c log.h ssh-keyscan.c] overwrite fatal() in ssh-keyscan.c; fixes pr 2354; ok provos@
Diffstat (limited to 'log.c')
-rw-r--r--log.c17
1 files changed, 2 insertions, 15 deletions
diff --git a/log.c b/log.c
index 5b25b5929..c88f632c9 100644
--- a/log.c
+++ b/log.c
@@ -34,7 +34,7 @@
34 */ 34 */
35 35
36#include "includes.h" 36#include "includes.h"
37RCSID("$OpenBSD: log.c,v 1.21 2002/02/04 12:15:25 markus Exp $"); 37RCSID("$OpenBSD: log.c,v 1.22 2002/02/22 12:20:34 markus Exp $");
38 38
39#include "log.h" 39#include "log.h"
40#include "xmalloc.h" 40#include "xmalloc.h"
@@ -88,8 +88,6 @@ static struct {
88 { NULL, SYSLOG_LEVEL_NOT_SET } 88 { NULL, SYSLOG_LEVEL_NOT_SET }
89}; 89};
90 90
91static void do_log(LogLevel level, const char *fmt, va_list args);
92
93SyslogFacility 91SyslogFacility
94log_facility_number(char *name) 92log_facility_number(char *name)
95{ 93{
@@ -111,17 +109,6 @@ log_level_number(char *name)
111 return log_levels[i].val; 109 return log_levels[i].val;
112 return SYSLOG_LEVEL_NOT_SET; 110 return SYSLOG_LEVEL_NOT_SET;
113} 111}
114/* Fatal messages. This function never returns. */
115
116void
117fatal(const char *fmt,...)
118{
119 va_list args;
120 va_start(args, fmt);
121 do_log(SYSLOG_LEVEL_FATAL, fmt, args);
122 va_end(args);
123 fatal_cleanup();
124}
125 112
126/* Error messages that should be logged. */ 113/* Error messages that should be logged. */
127 114
@@ -328,7 +315,7 @@ log_init(char *av0, LogLevel level, SyslogFacility facility, int on_stderr)
328 315
329#define MSGBUFSIZ 1024 316#define MSGBUFSIZ 1024
330 317
331static void 318void
332do_log(LogLevel level, const char *fmt, va_list args) 319do_log(LogLevel level, const char *fmt, va_list args)
333{ 320{
334 char msgbuf[MSGBUFSIZ]; 321 char msgbuf[MSGBUFSIZ];