From 3554b4afa38b3483a3302f1be18eaa6f843bb260 Mon Sep 17 00:00:00 2001 From: "djm@openbsd.org" Date: Sat, 17 Oct 2020 01:28:20 +0000 Subject: upstream: make the log functions that exit (sshlogdie(), sshfatal(), etc) have identical signatures. Makes things a bit more consistent... OpenBSD-Commit-ID: bd0ae124733389d7c0042e135c71ee9091362eb9 --- log.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'log.c') diff --git a/log.c b/log.c index 159c306de..164a843d0 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 * Copyright (c) 1995 Tatu Ylonen , 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); } -- cgit v1.2.3