- dtucker@cvs.openbsd.org 2006/07/18 08:22:23

[openssh.git] / log.h

diff --git a/log.h b/log.h
index 8ab5c0939205d66cd263663998bf6fbe48503570..9e1a2fcdbe47bf3ccf76e813927a8c6b97c28cd6 100644 (file)
--- a/log.h
+++ b/log.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: log.h,v 1.5 2002/02/04 12:15:25 markus Exp $  */
+/* $OpenBSD: log.h,v 1.13 2006/07/10 16:37:36 stevesk Exp $ */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -15,6 +15,8 @@
 #ifndef SSH_LOG_H
 #define SSH_LOG_H
 
+#include <stdarg.h>
+
 #include <syslog.h> /* Needed for LOG_AUTHPRIV (if present) */
 
 /* Supported syslog facilities and levels. */
@@ -33,7 +35,7 @@ typedef enum {
        SYSLOG_FACILITY_LOCAL5,
        SYSLOG_FACILITY_LOCAL6,
        SYSLOG_FACILITY_LOCAL7,
-       SYSLOG_FACILITY_NOT_SET = -1,
+       SYSLOG_FACILITY_NOT_SET = -1
 }       SyslogFacility;
 
 typedef enum {
@@ -45,7 +47,7 @@ typedef enum {
        SYSLOG_LEVEL_DEBUG1,
        SYSLOG_LEVEL_DEBUG2,
        SYSLOG_LEVEL_DEBUG3,
-       SYSLOG_LEVEL_NOT_SET = -1,
+       SYSLOG_LEVEL_NOT_SET = -1
 }       LogLevel;
 
 void     log_init(char *, LogLevel, SyslogFacility, int);
@@ -53,16 +55,14 @@ void     log_init(char *, LogLevel, SyslogFacility, int);
 SyslogFacility log_facility_number(char *);
 LogLevel log_level_number(char *);
 
-void     fatal(const char *, ...) __attribute__((format(printf, 1, 2)));
+void     fatal(const char *, ...) __dead __attribute__((format(printf, 1, 2)));
 void     error(const char *, ...) __attribute__((format(printf, 1, 2)));
-void     log(const char *, ...) __attribute__((format(printf, 1, 2)));
+void     logit(const char *, ...) __attribute__((format(printf, 1, 2)));
 void     verbose(const char *, ...) __attribute__((format(printf, 1, 2)));
 void     debug(const char *, ...) __attribute__((format(printf, 1, 2)));
 void     debug2(const char *, ...) __attribute__((format(printf, 1, 2)));
 void     debug3(const char *, ...) __attribute__((format(printf, 1, 2)));
 
-void     fatal_cleanup(void);
-void     fatal_add_cleanup(void (*) (void *), void *);
-void     fatal_remove_cleanup(void (*) (void *), void *);
-
+void    do_log(LogLevel, const char *, va_list);
+void    cleanup_exit(int) __dead;
 #endif