diff options
| author |   djm <djm@openbsd.org> | 2020-10-17 01:28:20 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2020-10-17 01:28:20 +0000 |
| commit | 5461b00b1759778b51fc83829523de99a5b8b3fb (patch) | |
| tree | 21c651758bde59d1dec94ae9bb28584577776e06 /usr.bin/ssh/log.h | |
| parent | Use the retguard macros from asm.h to protect the function. (diff) | |
| download | wireguard-openbsd-5461b00b1759778b51fc83829523de99a5b8b3fb.tar.xz wireguard-openbsd-5461b00b1759778b51fc83829523de99a5b8b3fb.zip | |
make the log functions that exit (sshlogdie(), sshfatal(), etc) have
identical signatures. Makes things a bit more consistent...
Diffstat (limited to 'usr.bin/ssh/log.h')
| -rw-r--r-- | usr.bin/ssh/log.h | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/usr.bin/ssh/log.h b/usr.bin/ssh/log.h index 96c5ede100b..7843b307076 100644 --- a/usr.bin/ssh/log.h +++ b/usr.bin/ssh/log.h @@ -1,4 +1,4 @@ -/* $OpenBSD: log.h,v 1.25 2020/10/16 13:24:45 djm Exp $ */ +/* $OpenBSD: log.h,v 1.26 2020/10/17 01:28:20 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> @@ -68,12 +68,15 @@ void sshlog(const char *, const char *, int, int, LogLevel, const char *, ...) __attribute__((format(printf, 6, 7))); void sshlogv(const char *, const char *, int, int, LogLevel, const char *, va_list); -void sshsigdie(const char *, const char *, int, const char *, ...) - __attribute__((noreturn)) __attribute__((format(printf, 4, 5))); -void sshlogdie(const char *, const char *, int, const char *, ...) - __attribute__((noreturn)) __attribute__((format(printf, 4, 5))); -void sshfatal(const char *, const char *, int, const char *, ...) - __attribute__((noreturn)) __attribute__((format(printf, 4, 5))); +void sshsigdie(const char *, const char *, int, int, + LogLevel, const char *, ...) __attribute__((noreturn)) + __attribute__((format(printf, 6, 7))); +void sshlogdie(const char *, const char *, int, int, + LogLevel, const char *, ...) __attribute__((noreturn)) + __attribute__((format(printf, 6, 7))); +void sshfatal(const char *, const char *, int, int, + LogLevel, const char *, ...) __attribute__((noreturn)) + __attribute__((format(printf, 6, 7))); #define ssh_nlog(level, ...) sshlog(__FILE__, __func__, __LINE__, 0, level, __VA_ARGS__) #define ssh_debug3(...) sshlog(__FILE__, __func__, __LINE__, 0, SYSLOG_LEVEL_DEBUG3, __VA_ARGS__) @@ -82,9 +85,9 @@ void sshfatal(const char *, const char *, int, const char *, ...) #define ssh_verbose(...) sshlog(__FILE__, __func__, __LINE__, 0, SYSLOG_LEVEL_VERBOSE, __VA_ARGS__) #define ssh_log(...) sshlog(__FILE__, __func__, __LINE__, 0, SYSLOG_LEVEL_INFO, __VA_ARGS__) #define ssh_error(...) sshlog(__FILE__, __func__, __LINE__, 0, SYSLOG_LEVEL_ERROR, __VA_ARGS__) -#define ssh_fatal(...) sshfatal(__FILE__, __func__, __LINE__, __VA_ARGS__) -#define ssh_logdie(...) sshlogdie(__FILE__, __func__, __LINE__, __VA_ARGS__) -#define ssh_sigdie(...) sshsigdie(__FILE__, __func__, __LINE__, __VA_ARGS__) +#define ssh_fatal(...) sshfatal(__FILE__, __func__, __LINE__, 0, SYSLOG_LEVEL_FATAL, __VA_ARGS__) +#define ssh_logdie(...) sshlogdie(__FILE__, __func__, __LINE__, 0, SYSLOG_LEVEL_ERROR, __VA_ARGS__) +#define ssh_sigdie(...) sshsigdie(__FILE__, __func__, __LINE__, 0, SYSLOG_LEVEL_ERROR, __VA_ARGS__) #define debug ssh_debug #define debug1 ssh_debug1 |