diff options
| author |   djm <djm@openbsd.org> | 2020-10-18 11:13:45 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2020-10-18 11:13:45 +0000 |
| commit | 1d58497b9649269934f161742ea66eb48361bf3b (patch) | |
| tree | 8e4520030a754790f3dbda24c1ceea914fdb1cdb | |
| parent | Fix several bugs in the TTM page fault handler and porperly integrate all the (diff) | |
| download | wireguard-openbsd-1d58497b9649269934f161742ea66eb48361bf3b.tar.xz wireguard-openbsd-1d58497b9649269934f161742ea66eb48361bf3b.zip | |
add some variant log.h calls that prepend the calling function
name; ok markus@
| -rw-r--r-- | usr.bin/ssh/log.h | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/usr.bin/ssh/log.h b/usr.bin/ssh/log.h index 7843b307076..6f2badda0f4 100644 --- a/usr.bin/ssh/log.h +++ b/usr.bin/ssh/log.h @@ -1,4 +1,4 @@ -/* $OpenBSD: log.h,v 1.26 2020/10/17 01:28:20 djm Exp $ */ +/* $OpenBSD: log.h,v 1.27 2020/10/18 11:13:45 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> @@ -89,6 +89,18 @@ void sshfatal(const char *, const char *, int, int, #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__) +/* Variants that prepend the caller's function */ +#define ssh_nlog_f(level, ...) sshlog(__FILE__, __func__, __LINE__, 1, level, __VA_ARGS__) +#define ssh_debug3_f(...) sshlog(__FILE__, __func__, __LINE__, 1, SYSLOG_LEVEL_DEBUG3, __VA_ARGS__) +#define ssh_debug2_f(...) sshlog(__FILE__, __func__, __LINE__, 1, SYSLOG_LEVEL_DEBUG2, __VA_ARGS__) +#define ssh_debug_f(...) sshlog(__FILE__, __func__, __LINE__, 1, SYSLOG_LEVEL_DEBUG1, __VA_ARGS__) +#define ssh_verbose_f(...) sshlog(__FILE__, __func__, __LINE__, 1, SYSLOG_LEVEL_VERBOSE, __VA_ARGS__) +#define ssh_log_f(...) sshlog(__FILE__, __func__, __LINE__, 1, SYSLOG_LEVEL_INFO, __VA_ARGS__) +#define ssh_error_f(...) sshlog(__FILE__, __func__, __LINE__, 1, SYSLOG_LEVEL_ERROR, __VA_ARGS__) +#define ssh_fatal_f(...) sshfatal(__FILE__, __func__, __LINE__, 1, SYSLOG_LEVEL_FATAL, __VA_ARGS__) +#define ssh_logdie_f(...) sshlogdie(__FILE__, __func__, __LINE__, 1, SYSLOG_LEVEL_ERROR, __VA_ARGS__) +#define ssh_sigdie_f(...) sshsigdie(__FILE__, __func__, __LINE__, 1, SYSLOG_LEVEL_ERROR, __VA_ARGS__) + #define debug ssh_debug #define debug1 ssh_debug1 #define debug2 ssh_debug2 |