diff options
| author | Todd C. Miller <millert@cvs.openbsd.org> | 2002-02-19 19:39:42 +0000 |
|---|---|---|
| committer | Todd C. Miller <millert@cvs.openbsd.org> | 2002-02-19 19:39:42 +0000 |
| commit | 3923126b85f9e8a77cab9a41b5a62125acd5b4cd (patch) | |
| tree | 1a8b19c5db03f8c989fc8228811837b182feb7a3 /usr.sbin/tcpdump/util.c | |
| parent | cc03bdb70090357d2393b6ec82e3cde4d5ce5edd (diff) | |
We live in an ANSI C world. Remove lots of gratuitous #ifdef __STDC__ cruft.
Diffstat (limited to 'usr.sbin/tcpdump/util.c')
| -rw-r--r-- | usr.sbin/tcpdump/util.c | 28 |
1 files changed, 2 insertions, 26 deletions
diff --git a/usr.sbin/tcpdump/util.c b/usr.sbin/tcpdump/util.c index f510451870c..98c6bc48492 100644 --- a/usr.sbin/tcpdump/util.c +++ b/usr.sbin/tcpdump/util.c @@ -1,4 +1,4 @@ -/* $OpenBSD: util.c,v 1.14 2001/11/06 03:11:40 deraadt Exp $ */ +/* $OpenBSD: util.c,v 1.15 2002/02/19 19:39:40 millert Exp $ */ /* * Copyright (c) 1990, 1991, 1993, 1994, 1995, 1996, 1997 @@ -23,7 +23,7 @@ #ifndef lint static const char rcsid[] = - "@(#) $Header: /cvs/OpenBSD/src/usr.sbin/tcpdump/util.c,v 1.14 2001/11/06 03:11:40 deraadt Exp $ (LBL)"; + "@(#) $Header: /cvs/OpenBSD/src/usr.sbin/tcpdump/util.c,v 1.15 2002/02/19 19:39:40 millert Exp $ (LBL)"; #endif #include <sys/types.h> @@ -38,11 +38,7 @@ static const char rcsid[] = #endif #include <pcap.h> #include <stdio.h> -#ifdef __STDC__ #include <stdarg.h> -#else -#include <varargs.h> -#endif #include <stdlib.h> #include <string.h> #ifdef TIME_WITH_SYS_TIME @@ -200,22 +196,12 @@ tok2str(register const struct tok *lp, register const char *fmt, /* VARARGS */ __dead void -#ifdef __STDC__ error(const char *fmt, ...) -#else -error(fmt, va_alist) - const char *fmt; - va_dcl -#endif { va_list ap; (void)fprintf(stderr, "%s: ", program_name); -#ifdef __STDC__ va_start(ap, fmt); -#else - va_start(ap); -#endif (void)vfprintf(stderr, fmt, ap); va_end(ap); if (*fmt) { @@ -229,22 +215,12 @@ error(fmt, va_alist) /* VARARGS */ void -#ifdef __STDC__ warning(const char *fmt, ...) -#else -warning(fmt, va_alist) - const char *fmt; - va_dcl -#endif { va_list ap; (void)fprintf(stderr, "%s: WARNING: ", program_name); -#ifdef __STDC__ va_start(ap, fmt); -#else - va_start(ap); -#endif (void)vfprintf(stderr, fmt, ap); va_end(ap); if (*fmt) { |