http://www.sxw.org.uk/computing/patches/openssh-4.2p1-gsskex-20050926-2.patch

[gssapi-openssh.git] / openssh / log.h

diff --git a/openssh/log.h b/openssh/log.h
index 42a9a6ec743d82923a53973d5b20107e7e10a1ea..2b3c3090f9306820185a8a5204c28b1b9388e830 100644 (file)
--- a/openssh/log.h
+++ b/openssh/log.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: log.h,v 1.6 2002/02/22 12:20:34 markus Exp $  */
+/*     $OpenBSD: log.h,v 1.11 2004/06/21 22:02:58 djm Exp $    */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -33,7 +33,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 +45,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,18 +53,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