summaryrefslogtreecommitdiffstats
path: root/fatal.c
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2020-10-17 03:28:20 +0200
committerDamien Miller <djm@mindrot.org>2020-10-17 13:45:37 +0200
commit3554b4afa38b3483a3302f1be18eaa6f843bb260 (patch)
tree106f6f150afcd85577f140f9a58fb2e161533877 /fatal.c
parentupstream: add space between macro arg and punctuation; (diff)
downloadopenssh-3554b4afa38b3483a3302f1be18eaa6f843bb260.tar.xz
openssh-3554b4afa38b3483a3302f1be18eaa6f843bb260.zip
upstream: make the log functions that exit (sshlogdie(),
sshfatal(), etc) have identical signatures. Makes things a bit more consistent... OpenBSD-Commit-ID: bd0ae124733389d7c0042e135c71ee9091362eb9
Diffstat (limited to 'fatal.c')
-rw-r--r--fatal.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/fatal.c b/fatal.c
index 3ecd510f1..40daa08b8 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);
}