upstream: add some variant log.h calls that prepend the calling

function name; ok markus@

OpenBSD-Commit-ID: 4be1b2e2455b271ddb7457bc195c5367644f4e48

diff --git a/log.h b/log.h
index 136bffc1ac9338d08eb18ea24a5c8fd6b4364a64..f9d7c5a9364b8dee715ba1284a8715cb2016b64e 100644 (file)
--- a/log.h
+++ b/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>
@@ -92,6 +92,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