From: Darren Tucker <dtucker@zip.com.au>
Date: Mon, 18 Jul 2016 06:26:26 +0000 (+1000)
Subject: Remove local implementation of err, errx.
X-Git-Tag: V_7_3_P1~22
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0a454147568746c503f669e1ba861f76a2e7a585;p=thirdparty%2Fopenssh-portable.git

Remove local implementation of err, errx.

We now have a shared implementation in libopenbsd-compat.
---

diff --git a/regress/modpipe.c b/regress/modpipe.c
index e854f9e07..c43e9cba1 100755
--- a/regress/modpipe.c
+++ b/regress/modpipe.c
@@ -27,34 +27,6 @@
 #include <errno.h>
 #include "openbsd-compat/getopt_long.c"
 
-static void err(int, const char *, ...) __attribute__((format(printf, 2, 3)));
-static void errx(int, const char *, ...) __attribute__((format(printf, 2, 3)));
-
-static void
-err(int r, const char *fmt, ...)
-{
-	va_list args;
-
-	va_start(args, fmt);
-	fprintf(stderr, "%s: ", strerror(errno));
-	vfprintf(stderr, fmt, args);
-	fputc('\n', stderr);
-	va_end(args);
-	exit(r);
-}
-
-static void
-errx(int r, const char *fmt, ...)
-{
-	va_list args;
-
-	va_start(args, fmt);
-	vfprintf(stderr, fmt, args);
-	fputc('\n', stderr);
-	va_end(args);
-	exit(r);
-}
-
 static void
 usage(void)
 {