try fetch names from CVS logs and adding here

[tcpdump] / tcpdump.c

diff --git a/tcpdump.c b/tcpdump.c
index f1bcf48bc5c5329e22346cc068d60b1e5953eff4..9915901939d7320b4ad07f339cd1183548035c66 100644 (file)
--- a/tcpdump.c
+++ b/tcpdump.c
@@ -24,7 +24,7 @@ static const char copyright[] =
     "@(#) Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997\n\
 The Regents of the University of California.  All rights reserved.\n";
 static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/tcpdump.c,v 1.147 2000-06-01 01:10:31 assar Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/tcpdump.c,v 1.150 2000-07-25 05:28:12 guy Exp $ (LBL)";
 #endif
 
 /*
@@ -88,12 +88,9 @@ char *program_name;
 
 int32_t thiszone;              /* seconds offset from gmt to local time */
 
-/* Externs */
-extern void bpf_dump(struct bpf_program *, int);
-
 /* Forwards */
-RETSIGTYPE cleanup(int);
-extern __dead void usage(void) __attribute__((volatile));
+static RETSIGTYPE cleanup(int);
+static void usage(void) __attribute__((noreturn));
 
 /* Length of saved portion of packet. */
 int snaplen = DEFAULT_SNAPLEN;
@@ -105,7 +102,7 @@ struct printer {
 
 static struct printer printers[] = {
        { ether_if_print,       DLT_EN10MB },
-       { ether_if_print,       DLT_IEEE802 },
+       { token_if_print,       DLT_IEEE802 },
 #ifdef DLT_LANE8023
        { lane_if_print,        DLT_LANE8023 },
 #endif
@@ -429,7 +426,7 @@ main(int argc, char **argv)
 }
 
 /* make a clean exit on interrupts */
-RETSIGTYPE
+static RETSIGTYPE
 cleanup(int signo)
 {
        struct pcap_stat stat;
@@ -486,7 +483,7 @@ default_print(register const u_char *bp, register u_int length)
        default_print_unaligned(bp, length);
 }
 
-__dead void
+static void
 usage(void)
 {
        extern char version[];