summaryrefslogtreecommitdiffstats
path: root/usr.sbin/mrinfo
diff options
context:
space:
mode:
authormillert <millert@openbsd.org>2002-02-19 19:39:35 +0000
committermillert <millert@openbsd.org>2002-02-19 19:39:35 +0000
commite7beb4a7d58a6a0955c07ef9465f5caa3383f928 (patch)
treea90c75bb4a04ab98987b06850cbdffd6c1903e17 /usr.sbin/mrinfo
parentEvery command should have a manual page. (diff)
downloadwireguard-openbsd-e7beb4a7d58a6a0955c07ef9465f5caa3383f928.tar.xz
wireguard-openbsd-e7beb4a7d58a6a0955c07ef9465f5caa3383f928.zip
We live in an ANSI C world. Remove lots of gratuitous #ifdef __STDC__ cruft.
Diffstat (limited to 'usr.sbin/mrinfo')
-rw-r--r--usr.sbin/mrinfo/mrinfo.c19
1 files changed, 1 insertions, 18 deletions
diff --git a/usr.sbin/mrinfo/mrinfo.c b/usr.sbin/mrinfo/mrinfo.c
index 1fbd584aeac..b49f0a9eb44 100644
--- a/usr.sbin/mrinfo/mrinfo.c
+++ b/usr.sbin/mrinfo/mrinfo.c
@@ -87,11 +87,7 @@ static char rcsid[] =
#include <sys/time.h>
#include "defs.h"
#include <arpa/inet.h>
-#ifdef __STDC__
#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
#define DEFAULT_TIMEOUT 4 /* How long to wait before retrying requests */
#define DEFAULT_RETRIES 3 /* How many times to ask each router */
@@ -140,26 +136,12 @@ inet_name(addr)
* message and the current debug level. For errors of severity LOG_ERR or
* worse, terminate the program.
*/
-#ifdef __STDC__
void
log(int severity, int syserr, char *format, ...)
{
va_list ap;
char fmt[100];
- va_start(ap, format);
-#else
-void
-log(severity, syserr, format, va_alist)
- int severity, syserr;
- char *format;
- va_dcl
-{
- va_list ap;
- char fmt[100];
-
- va_start(ap);
-#endif
switch (debug) {
case 0:
if (severity > LOG_WARNING)
@@ -175,6 +157,7 @@ log(severity, syserr, format, va_alist)
if (severity == LOG_WARNING)
strcat(fmt, "warning - ");
strncat(fmt, format, 80);
+ va_start(ap, format);
vfprintf(stderr, fmt, ap);
va_end(ap);
if (syserr == 0)