[openssh-commits] [openssh] 02/03: upstream: make the log functions that exit (sshlogdie(),
git+noreply at mindrot.org
git+noreply at mindrot.org
Sat Oct 17 22:47:58 AEDT 2020
This is an automated email from the git hooks/post-receive script.
djm pushed a commit to branch master
in repository openssh.
commit 3554b4afa38b3483a3302f1be18eaa6f843bb260
Author: djm at openbsd.org <djm at openbsd.org>
Date: Sat Oct 17 01:28:20 2020 +0000
upstream: make the log functions that exit (sshlogdie(),
sshfatal(), etc) have identical signatures. Makes things a bit more
consistent...
OpenBSD-Commit-ID: bd0ae124733389d7c0042e135c71ee9091362eb9
---
fatal.c | 7 ++++---
log.c | 12 +++++++-----
log.h | 23 +++++++++++++----------
ssh-keyscan.c | 8 ++++----
4 files changed, 28 insertions(+), 22 deletions(-)
diff --git a/fatal.c b/fatal.c
index 3ecd510f..40daa08b 100644
--- a/fatal.c
+++ b/fatal.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fatal.c,v 1.8 2020/10/16 13:24:45 djm Exp $ */
+/* $OpenBSD: fatal.c,v 1.9 2020/10/17 01:28:20 djm Exp $ */
/*
* Copyright (c) 2002 Markus Friedl. All rights reserved.
*
@@ -34,12 +34,13 @@
/* Fatal messages. This function never returns. */
void
-sshfatal(const char *file, const char *func, int line, const char *fmt, ...)
+sshfatal(const char *file, const char *func, int line, int showfunc,
+ LogLevel level, const char *fmt, ...)
{
va_list args;
va_start(args, fmt);
- ssh_log(file, func, line, SYSLOG_LEVEL_FATAL, fmt, args);
+ ssh_log(file, func, line, showfunc, level, fmt, args);
va_end(args);
cleanup_exit(255);
}
diff --git a/log.c b/log.c
index 159c306d..164a843d 100644
--- a/log.c
+++ b/log.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: log.c,v 1.53 2020/10/16 13:24:45 djm Exp $ */
+/* $OpenBSD: log.c,v 1.54 2020/10/17 01:28:20 djm Exp $ */
/*
* Author: Tatu Ylonen <ylo at cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo at cs.hut.fi>, Espoo, Finland
@@ -427,23 +427,25 @@ sshlog(const char *file, const char *func, int line, int showfunc,
}
void
-sshlogdie(const char *file, const char *func, int line, const char *fmt, ...)
+sshlogdie(const char *file, const char *func, int line, int showfunc,
+ LogLevel level, const char *fmt, ...)
{
va_list args;
va_start(args, fmt);
- sshlogv(file, func, line, 0, SYSLOG_LEVEL_INFO, fmt, args);
+ sshlogv(file, func, line, showfunc, SYSLOG_LEVEL_INFO, fmt, args);
va_end(args);
cleanup_exit(255);
}
void
-sshsigdie(const char *file, const char *func, int line, const char *fmt, ...)
+sshsigdie(const char *file, const char *func, int line, int showfunc,
+ LogLevel level, const char *fmt, ...)
{
va_list args;
va_start(args, fmt);
- sshlogv(file, func, line, 0, SYSLOG_LEVEL_FATAL, fmt, args);
+ sshlogv(file, func, line, showfunc, SYSLOG_LEVEL_FATAL, fmt, args);
va_end(args);
_exit(1);
}
diff --git a/log.h b/log.h
index b1ab7c7e..136bffc1 100644
--- a/log.h
+++ b/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 at cs.hut.fi>
@@ -71,12 +71,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__)
@@ -85,9 +88,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
diff --git a/ssh-keyscan.c b/ssh-keyscan.c
index ac7bfcd1..11816559 100644
--- a/ssh-keyscan.c
+++ b/ssh-keyscan.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-keyscan.c,v 1.133 2020/10/16 13:24:45 djm Exp $ */
+/* $OpenBSD: ssh-keyscan.c,v 1.134 2020/10/17 01:28:20 djm Exp $ */
/*
* Copyright 1995, 1996 by David Mazieres <dm at lcs.mit.edu>.
*
@@ -635,13 +635,13 @@ do_host(char *host)
}
void
-sshfatal(const char *file, const char *func, int line,
- const char *fmt, ...)
+sshfatal(const char *file, const char *func, int line, int showfunc,
+ LogLevel level, const char *fmt, ...)
{
va_list args;
va_start(args, fmt);
- ssh_log(file, func, line, SYSLOG_LEVEL_FATAL, fmt, args);
+ ssh_log(file, func, line, showfunc, level, fmt, args);
va_end(args);
cleanup_exit(255);
}
--
To stop receiving notification emails like this one, please contact
djm at mindrot.org.
More information about the openssh-commits
mailing list