=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/log.h,v retrieving revision 1.2.2.6 retrieving revision 1.3 diff -u -r1.2.2.6 -r1.3 --- src/usr.bin/ssh/log.h 2002/03/08 17:04:42 1.2.2.6 +++ src/usr.bin/ssh/log.h 2001/06/26 06:32:55 1.3 @@ -1,4 +1,4 @@ -/* $OpenBSD: log.h,v 1.2.2.6 2002/03/08 17:04:42 brad Exp $ */ +/* $OpenBSD: log.h,v 1.3 2001/06/26 06:32:55 itojun Exp $ */ /* * Author: Tatu Ylonen @@ -27,8 +27,7 @@ SYSLOG_FACILITY_LOCAL4, SYSLOG_FACILITY_LOCAL5, SYSLOG_FACILITY_LOCAL6, - SYSLOG_FACILITY_LOCAL7, - SYSLOG_FACILITY_NOT_SET = -1, + SYSLOG_FACILITY_LOCAL7 } SyslogFacility; typedef enum { @@ -39,27 +38,38 @@ SYSLOG_LEVEL_VERBOSE, SYSLOG_LEVEL_DEBUG1, SYSLOG_LEVEL_DEBUG2, - SYSLOG_LEVEL_DEBUG3, - SYSLOG_LEVEL_NOT_SET = -1, + SYSLOG_LEVEL_DEBUG3 } LogLevel; +/* Initializes logging. */ +void log_init(char *, LogLevel, SyslogFacility, int); -void log_init(char *, LogLevel, SyslogFacility, int); +/* Logging implementation, depending on server or client */ +void do_log(LogLevel, const char *, va_list); -SyslogFacility log_facility_number(char *); +/* name to facility/level */ +SyslogFacility log_facility_number(char *); LogLevel log_level_number(char *); -void fatal(const char *, ...) __attribute__((format(printf, 1, 2))); -void error(const char *, ...) __attribute__((format(printf, 1, 2))); -void log(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))); +/* Output a message to syslog or stderr */ +void fatal(const char *, ...) __attribute__((format(printf, 1, 2))); +void error(const char *, ...) __attribute__((format(printf, 1, 2))); +void log(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 *); +/* same as fatal() but w/o logging */ +void fatal_cleanup(void); -void do_log(LogLevel, const char *, va_list); +/* + * Registers a cleanup function to be called by fatal()/fatal_cleanup() + * before exiting. It is permissible to call fatal_remove_cleanup for the + * function itself from the function. + */ +void fatal_add_cleanup(void (*) (void *), void *); + +/* Removes a cleanup function to be called at fatal(). */ +void fatal_remove_cleanup(void (*) (void *), void *); #endif