From 6310ef27a2567cda66d6cf0c1ad290ee1167f243 Mon Sep 17 00:00:00 2001 From: Darren Tucker Date: Wed, 13 Jul 2016 14:42:35 +1000 Subject: Move err.h replacements into compat lib. Move implementations of err.h replacement functions into their own file in the libopenbsd-compat so we can use them in kexfuzz.c too. ok djm@ --- regress/netcat.c | 40 ---------------------------------------- 1 file changed, 40 deletions(-) (limited to 'regress/netcat.c') diff --git a/regress/netcat.c b/regress/netcat.c index 6234ba019..7c29e0cf9 100644 --- a/regress/netcat.c +++ b/regress/netcat.c @@ -134,46 +134,6 @@ void usage(int); ssize_t drainbuf(int, unsigned char *, size_t *); ssize_t fillbuf(int, unsigned char *, size_t *); -static void err(int, const char *, ...) __attribute__((format(printf, 2, 3))); -static void errx(int, const char *, ...) __attribute__((format(printf, 2, 3))); -static void warn(const char *, ...) __attribute__((format(printf, 1, 2))); - -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 -warn(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); -} int main(int argc, char *argv[]) -- cgit v1.2.3 From 8aaec7050614494014c47510b7e94daf6e644c62 Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Thu, 14 Jul 2016 09:48:48 +1000 Subject: fix missing include for systems with err.h --- regress/netcat.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'regress/netcat.c') diff --git a/regress/netcat.c b/regress/netcat.c index 7c29e0cf9..98a08b1ec 100644 --- a/regress/netcat.c +++ b/regress/netcat.c @@ -61,6 +61,9 @@ # include # endif #endif +#ifdef HAVE_ERR_H +# include +#endif /* Telnet options from arpa/telnet.h */ #define IAC 255 -- cgit v1.2.3