summaryrefslogtreecommitdiff
path: root/util.c
diff options
context:
space:
mode:
authorassar <assar>2000-07-01 03:38:59 +0000
committerassar <assar>2000-07-01 03:38:59 +0000
commit3cd171317f54bc968808d49e3ca87b6c49ccdcdd (patch)
treef78e391f0e2093199088698670ab53c2d3c4c095 /util.c
parent5a0c056a7c0204e5c1afcfcbea59befe0c4fb4a7 (diff)
downloadtcpdump-3cd171317f54bc968808d49e3ca87b6c49ccdcdd.tar.gz
remove non-STDC code
Diffstat (limited to 'util.c')
-rw-r--r--util.c29
1 files changed, 1 insertions, 28 deletions
diff --git a/util.c b/util.c
index 7806a9f0..c205615a 100644
--- a/util.c
+++ b/util.c
@@ -21,7 +21,7 @@
#ifndef lint
static const char rcsid[] =
- "@(#) $Header: /tcpdump/master/tcpdump/util.c,v 1.67 2000-06-21 09:08:34 itojun Exp $ (LBL)";
+ "@(#) $Header: /tcpdump/master/tcpdump/util.c,v 1.68 2000-07-01 03:39:12 assar Exp $ (LBL)";
#endif
#ifdef HAVE_CONFIG_H
@@ -38,16 +38,9 @@ static const char rcsid[] =
#ifdef HAVE_FCNTL_H
#include <fcntl.h>
#endif
-#ifdef HAVE_MALLOC_H
-#include <malloc.h>
-#endif
#include <pcap.h>
#include <stdio.h>
-#if __STDC__
#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
#include <stdlib.h>
#include <string.h>
#ifdef TIME_WITH_SYS_TIME
@@ -227,22 +220,12 @@ tok2str(register const struct tok *lp, register const char *fmt,
/* VARARGS */
__dead void
-#if __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);
-#if __STDC__
va_start(ap, fmt);
-#else
- va_start(ap);
-#endif
(void)vfprintf(stderr, fmt, ap);
va_end(ap);
if (*fmt) {
@@ -256,22 +239,12 @@ error(fmt, va_alist)
/* VARARGS */
void
-#if __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);
-#if __STDC__
va_start(ap, fmt);
-#else
- va_start(ap);
-#endif
(void)vfprintf(stderr, fmt, ap);
va_end(ap);
if (*fmt) {