remove non-STDC code

diff --git a/addrtoname.c b/addrtoname.c
index 6a864abb76e9c922ca30e18711389ba365be35dc..8bfc803dc1b5f976adb0f146808e329ea1938712 100644 (file)
--- a/addrtoname.c
+++ b/addrtoname.c
@@ -23,7 +23,7 @@
  */
 #ifndef lint
 static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/addrtoname.c,v 1.67 2000-01-19 05:24:16 itojun Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/addrtoname.c,v 1.68 2000-07-01 03:38:59 assar Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -34,10 +34,8 @@ static const char rcsid[] =
 #include <sys/socket.h>
 #include <sys/time.h>
 
-#if __STDC__
 struct mbuf;
 struct rtentry;
-#endif
 #include <net/if.h>
 
 #include <netinet/in.h>
@@ -53,12 +51,6 @@ struct rtentry;
 #include <netdb.h>
 #include <pcap.h>
 #include <pcap-namedb.h>
-#ifdef HAVE_MALLOC_H
-#include <malloc.h>
-#endif
-#ifdef HAVE_MEMORY_H
-#include <memory.h>
-#endif
 #include <signal.h>
 #include <stdio.h>
 #include <string.h>

diff --git a/interface.h b/interface.h
index c1e4a7c12822b71061ce0da833fc2857bd75c220..cd661c50b4c30125185e2b5fac0ac646f3f045d4 100644 (file)
--- a/interface.h
+++ b/interface.h
@@ -18,7 +18,7 @@
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * @(#) $Header: /tcpdump/master/tcpdump/interface.h,v 1.130 2000-06-26 10:54:29 assar Exp $ (LBL)
+ * @(#) $Header: /tcpdump/master/tcpdump/interface.h,v 1.131 2000-07-01 03:39:00 assar Exp $ (LBL)
  */
 
 #ifndef tcpdump_interface_h
@@ -186,9 +186,7 @@ extern const u_char *snapend;
 /* Bail if "var" was not captured */
 #define TCHECK(var) TCHECK2(var, sizeof(var))
 
-#ifdef __STDC__
 struct timeval;
-#endif
 
 extern void ts_print(const struct timeval *);
 extern void relts_print(int);
@@ -200,11 +198,9 @@ extern char *dnaddr_string(u_short);
 
 extern void wrapup(int);
 
-#if __STDC__
 extern __dead void error(const char *, ...)
     __attribute__((volatile, format (printf, 1, 2)));
 extern void warning(const char *, ...) __attribute__ ((format (printf, 1, 2)));
-#endif
 
 extern char *read_infile(char *);
 extern char *copy_argv(char **);
@@ -220,9 +216,7 @@ extern char *dnnum_string(u_short);
 
 /* The printer routines. */
 
-#ifdef __STDC__
 struct pcap_pkthdr;
-#endif
 
 extern void ascii_print_with_offset(const u_char *, u_int, u_int);    
 extern void ascii_print(const u_char *, u_int);    

diff --git a/parsenfsfh.c b/parsenfsfh.c
index cfead1accff198c8d726b38e0634bfa11d940eaa..57c1e8ac6155215e9eac558cc3befabc96c46a53 100644 (file)
--- a/parsenfsfh.c
+++ b/parsenfsfh.c
@@ -9,7 +9,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/parsenfsfh.c,v 1.17 2000-06-01 01:02:15 assar Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/parsenfsfh.c,v 1.18 2000-07-01 03:39:00 assar Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -20,9 +20,6 @@ static const char rcsid[] =
 #include <sys/time.h>
 
 #include <ctype.h>
-#ifdef HAVE_MEMORY_H
-#include <memory.h>
-#endif
 #include <stdio.h>
 #include <string.h>
 

diff --git a/print-arp.c b/print-arp.c
index 4760f8176fb4ea346f25e4bf5b02dd70395d1dd8..ac326a4dcb86165914a0ecf2d9c2dd10f418125f 100644 (file)
--- a/print-arp.c
+++ b/print-arp.c
@@ -21,7 +21,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-arp.c,v 1.44 1999-11-21 09:36:48 fenner Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-arp.c,v 1.45 2000-07-01 03:39:01 assar Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -32,18 +32,13 @@ static const char rcsid[] =
 #include <sys/time.h>
 #include <sys/socket.h>
 
-#if __STDC__
 struct mbuf;
 struct rtentry;
-#endif
 #include <net/if.h>
 
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
 
-#ifdef HAVE_MEMORY_H
-#include <memory.h>
-#endif
 #include <stdio.h>
 #include <string.h>
 

diff --git a/print-atm.c b/print-atm.c
index 96bff48fe8b4b51b44ec715b9eaaecf55d8c6e3d..60b70a818afb76ab530889792ce242731df7b81b 100644 (file)
--- a/print-atm.c
+++ b/print-atm.c
@@ -20,7 +20,7 @@
  */
 #ifndef lint
 static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-atm.c,v 1.12 1999-11-21 09:36:48 fenner Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-atm.c,v 1.13 2000-07-01 03:39:01 assar Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -31,10 +31,8 @@ static const char rcsid[] =
 #include <sys/time.h>
 #include <sys/socket.h>
 
-#if __STDC__
 struct mbuf;
 struct rtentry;
-#endif
 #include <net/if.h>
 
 #include <netinet/in.h>

diff --git a/print-bootp.c b/print-bootp.c
index bdd4b3a6df0b9c4d2dda0265c66c6884cda11423..ec1052b198066c59a62eb037ddd9cfb0c2d1731d 100644 (file)
--- a/print-bootp.c
+++ b/print-bootp.c
@@ -22,7 +22,7 @@
  */
 #ifndef lint
 static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-bootp.c,v 1.48 1999-11-21 09:36:49 fenner Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-bootp.c,v 1.49 2000-07-01 03:39:01 assar Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -33,19 +33,14 @@ static const char rcsid[] =
 #include <sys/time.h>
 #include <sys/socket.h>
 
-#if __STDC__
 struct mbuf;
 struct rtentry;
-#endif
 #include <net/if.h>
 
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
 
 #include <ctype.h>
-#ifdef HAVE_MEMORY_H
-#include <memory.h>
-#endif
 #include <stdio.h>
 #include <string.h>
 

diff --git a/print-chdlc.c b/print-chdlc.c
index 9fd3c8423c91d8559b98ce2842a2686c7cb514b4..d6766989bd45dcff49379fb522d871f19b09b72f 100644 (file)
--- a/print-chdlc.c
+++ b/print-chdlc.c
@@ -22,7 +22,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-chdlc.c,v 1.3 2000-04-24 12:59:39 itojun Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-chdlc.c,v 1.4 2000-07-01 03:39:01 assar Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -35,10 +35,8 @@ static const char rcsid[] =
 #include <sys/file.h>
 #include <sys/ioctl.h>
 
-#if __STDC__
 struct mbuf;
 struct rtentry;
-#endif
 #include <net/if.h>
 
 #include <netinet/in.h>

diff --git a/print-decnet.c b/print-decnet.c
index 4c290f9ef8552e96b28015e7a41aa4ab8338dbb8..224d51a14d4e2057b30a0b1015d07d9f8be0ba95 100644 (file)
--- a/print-decnet.c
+++ b/print-decnet.c
@@ -21,7 +21,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-decnet.c,v 1.28 2000-01-17 06:24:24 itojun Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-decnet.c,v 1.29 2000-07-01 03:39:01 assar Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -32,10 +32,8 @@ static const char rcsid[] =
 #include <sys/time.h>
 #include <sys/socket.h>
 
-#if __STDC__
 struct mbuf;
 struct rtentry;
-#endif
 #include <net/if.h>
 
 #ifdef HAVE_LIBDNET
@@ -43,9 +41,6 @@ struct rtentry;
 #endif
 
 #include <ctype.h>
-#ifdef HAVE_MALLOC_H
-#include <malloc.h>
-#endif
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

diff --git a/print-dhcp6.c b/print-dhcp6.c
index 3897de660bd0469fb956642dc55409416763fa00..5fbf5587fd409edb53f0239099413deb58e37c51 100644 (file)
--- a/print-dhcp6.c
+++ b/print-dhcp6.c
@@ -29,7 +29,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-dhcp6.c,v 1.8 2000-05-17 05:00:12 itojun Exp $";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-dhcp6.c,v 1.9 2000-07-01 03:39:02 assar Exp $";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -40,18 +40,13 @@ static const char rcsid[] =
 #include <sys/time.h>
 #include <sys/socket.h>
 
-#if __STDC__
 struct mbuf;
 struct rtentry;
-#endif
 #include <net/if.h>
 
 #include <netinet/in.h>
 
 #include <ctype.h>
-#ifdef HAVE_MEMORY_H
-#include <memory.h>
-#endif
 #include <stdio.h>
 #include <string.h>
 #include <arpa/inet.h>

diff --git a/print-domain.c b/print-domain.c
index 82c329d40bf71587ddc2cadb8d35c828e0c0ffb3..172d5267eb16fd437f28b977cee5aa7bdeca5e97 100644 (file)
--- a/print-domain.c
+++ b/print-domain.c
@@ -21,7 +21,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-domain.c,v 1.44 2000-04-27 03:44:05 itojun Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-domain.c,v 1.45 2000-07-01 03:39:02 assar Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -32,10 +32,8 @@ static const char rcsid[] =
 #include <sys/time.h>
 #include <sys/socket.h>
 
-#if __STDC__
 struct mbuf;
 struct rtentry;
-#endif
 #include <net/if.h>
 
 #include <netinet/in.h>

diff --git a/print-ether.c b/print-ether.c
index bd2a7b7b48964a1b0163006a1e3221a91756ea07..573fdba8a124b3341c56771f13065d4b5be88fe3 100644 (file)
--- a/print-ether.c
+++ b/print-ether.c
@@ -20,7 +20,7 @@
  */
 #ifndef lint
 static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-ether.c,v 1.50 2000-06-10 13:49:52 assar Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-ether.c,v 1.51 2000-07-01 03:39:02 assar Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -31,10 +31,8 @@ static const char rcsid[] =
 #include <sys/time.h>
 #include <sys/socket.h>
 
-#if __STDC__
 struct mbuf;
 struct rtentry;
-#endif
 #include <net/if.h>
 
 #include <netinet/in.h>

diff --git a/print-fddi.c b/print-fddi.c
index 858dfb5ae7b52d95ba0429eb4f4f6d7356d5240a..bd4bd4f9e9f5e082f208b9ba5a9053889c821cd9 100644 (file)
--- a/print-fddi.c
+++ b/print-fddi.c
@@ -21,7 +21,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-fddi.c,v 1.40 1999-12-14 16:49:02 fenner Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-fddi.c,v 1.41 2000-07-01 03:39:02 assar Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -34,10 +34,8 @@ static const char rcsid[] =
 #include <sys/file.h>
 #include <sys/ioctl.h>
 
-#if __STDC__
 struct mbuf;
 struct rtentry;
-#endif
 #include <net/if.h>
 
 #include <netinet/in.h>

diff --git a/print-icmp.c b/print-icmp.c
index 2d846a966c967e62fe0b0fcbf543245679144fa5..f7b1b2b904b0b2381a4330ec46fec3bb5f968669 100644 (file)
--- a/print-icmp.c
+++ b/print-icmp.c
@@ -21,7 +21,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-icmp.c,v 1.47 2000-06-10 13:41:19 assar Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-icmp.c,v 1.48 2000-07-01 03:39:03 assar Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -32,10 +32,8 @@ static const char rcsid[] =
 #include <sys/time.h>
 #include <sys/socket.h>
 
-#if __STDC__
 struct mbuf;
 struct rtentry;
-#endif
 #include <net/if.h>
 
 #include <netinet/in.h>

diff --git a/print-ip.c b/print-ip.c
index 0d86de55da82816093768cb2f3444968524dd445..6a92fb72f9c892641094d9e2ba4496f836f05516 100644 (file)
--- a/print-ip.c
+++ b/print-ip.c
@@ -21,7 +21,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-ip.c,v 1.82 2000-05-10 05:11:27 itojun Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-ip.c,v 1.83 2000-07-01 03:39:03 assar Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -40,9 +40,6 @@ static const char rcsid[] =
 #include <netinet/udp_var.h>
 #include <netinet/tcp.h>
 
-#ifdef HAVE_MALLOC_H
-#include <malloc.h>
-#endif
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

diff --git a/print-ip6.c b/print-ip6.c
index ec964f1fd4b2a124261b4261cce0e4ae8fd38f22..14a8c5cefb2119349b7dc9ed0a551b407fcfa985 100644 (file)
--- a/print-ip6.c
+++ b/print-ip6.c
@@ -21,7 +21,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-ip6.c,v 1.5 2000-04-09 19:15:14 assar Exp $";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-ip6.c,v 1.6 2000-07-01 03:39:05 assar Exp $";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -44,9 +44,7 @@ static const char rcsid[] =
 #include <netinet/tcp.h>
 
 #include <stdio.h>
-#ifdef __STDC__
 #include <stdlib.h>
-#endif
 #include <unistd.h>
 
 #include "interface.h"

diff --git a/print-ipx.c b/print-ipx.c
index a5decb4a7b2b20fe1d004920d3d98b576e36afb0..323088d19e40fc62d989f467386566eb5e5546d3 100644 (file)
--- a/print-ipx.c
+++ b/print-ipx.c
@@ -24,7 +24,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-ipx.c,v 1.23 2000-01-17 06:24:25 itojun Exp $";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-ipx.c,v 1.24 2000-07-01 03:39:05 assar Exp $";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -43,9 +43,7 @@ static const char rcsid[] =
 #include <netinet/udp_var.h>
 #include <netinet/tcp.h>
 
-#ifdef __STDC__
 #include <stdlib.h>
-#endif
 #include <stdio.h>
 #include <string.h>
 

diff --git a/print-isakmp.c b/print-isakmp.c
index 725604ff677a020a1caa04fb31897d460ec0f331..75c68787cd1a0db4843336e69f9e449f569da1c0 100644 (file)
--- a/print-isakmp.c
+++ b/print-isakmp.c
@@ -30,7 +30,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-isakmp.c,v 1.12 2000-04-28 11:14:48 itojun Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-isakmp.c,v 1.13 2000-07-01 03:39:05 assar Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -43,10 +43,8 @@ static const char rcsid[] =
 #include <sys/time.h>
 #include <sys/socket.h>
 
-#if __STDC__
 struct mbuf;
 struct rtentry;
-#endif
 #include <net/if.h>
 
 #include <netinet/in.h>

diff --git a/print-isoclns.c b/print-isoclns.c
index 300228ec91ff747ab91fa30c3a069cb9bfb727b2..bf832fb6465166b918cf6b905e2f5b7631b6541e 100644 (file)
--- a/print-isoclns.c
+++ b/print-isoclns.c
@@ -23,7 +23,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-isoclns.c,v 1.16 1999-11-21 09:36:55 fenner Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-isoclns.c,v 1.17 2000-07-01 03:39:06 assar Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -34,10 +34,8 @@ static const char rcsid[] =
 #include <sys/time.h>
 #include <sys/socket.h>
 
-#if __STDC__
 struct mbuf;
 struct rtentry;
-#endif
 #include <net/if.h>
 
 #include <netinet/in.h>

diff --git a/print-lcp.c b/print-lcp.c
index 88dd6b73ef0be501606dd3f42a8a4c696aace144..d7695e14184b0b56724c6f066d33e949ced942a3 100644 (file)
--- a/print-lcp.c
+++ b/print-lcp.c
@@ -21,7 +21,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-"@(#) $Header: /tcpdump/master/tcpdump/Attic/print-lcp.c,v 1.5 2000-05-15 00:38:37 assar Exp $ (LBL)";
+"@(#) $Header: /tcpdump/master/tcpdump/Attic/print-lcp.c,v 1.6 2000-07-01 03:39:06 assar Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -32,18 +32,13 @@ static const char rcsid[] =
 #include <sys/time.h>
 #include <sys/socket.h>
 
-#if __STDC__
 struct mbuf;
 struct rtentry;
-#endif
 #include <net/if.h>
 
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
 
-#ifdef HAVE_MEMORY_H
-#include <memory.h>
-#endif
 #include <stdio.h>
 #include <string.h>
 

diff --git a/print-netbios.c b/print-netbios.c
index 98331d991ee013d754fdc4c32295c56d2329dccd..d2bde87392f03e702e8adac0c6d42c38da2555c5 100644 (file)
--- a/print-netbios.c
+++ b/print-netbios.c
@@ -24,7 +24,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-netbios.c,v 1.13 1999-11-21 09:36:57 fenner Exp $";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-netbios.c,v 1.14 2000-07-01 03:39:06 assar Exp $";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -43,9 +43,7 @@ static const char rcsid[] =
 #include <netinet/tcp.h>
 #include <netinet/tcpip.h>
 
-#ifdef __STDC__
 #include <stdlib.h>
-#endif
 #include <stdio.h>
 #include <string.h>
 

diff --git a/print-nfs.c b/print-nfs.c
index 4fb7256fac993fa46f6cf77fc682ef7cb27db508..a6b88715ff7dc599f2d6a7d5e414781926303288 100644 (file)
--- a/print-nfs.c
+++ b/print-nfs.c
@@ -21,7 +21,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-nfs.c,v 1.77 2000-06-12 15:45:05 itojun Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-nfs.c,v 1.78 2000-07-01 03:39:06 assar Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -32,10 +32,8 @@ static const char rcsid[] =
 #include <sys/time.h>
 #include <sys/socket.h>
 
-#if __STDC__
 struct mbuf;
 struct rtentry;
-#endif
 #include <net/if.h>
 
 #include <netinet/in.h>

diff --git a/print-ntp.c b/print-ntp.c
index 661ed30f08f6071e754b5fd57d08616945f2e5db..886a45fa1b9323d572d6821e8b2e5b73c71acc6a 100644 (file)
--- a/print-ntp.c
+++ b/print-ntp.c
@@ -25,7 +25,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-ntp.c,v 1.27 1999-11-21 09:36:57 fenner Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-ntp.c,v 1.28 2000-07-01 03:39:07 assar Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -36,10 +36,8 @@ static const char rcsid[] =
 #include <sys/time.h>
 #include <sys/socket.h>
 
-#if __STDC__
 struct mbuf;
 struct rtentry;
-#endif
 #include <net/if.h>
 
 #include <netinet/in.h>

diff --git a/print-null.c b/print-null.c
index 7089eb9d08b96c9ab7175b3a82c8e25adc93c466..5c312e1594a53936bb403c33792987e583cfba00 100644 (file)
--- a/print-null.c
+++ b/print-null.c
@@ -21,7 +21,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-null.c,v 1.30 1999-12-22 06:27:21 itojun Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-null.c,v 1.31 2000-07-01 03:39:07 assar Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -34,10 +34,8 @@ static const char rcsid[] =
 #include <sys/file.h>
 #include <sys/ioctl.h>
 
-#if __STDC__
 struct mbuf;
 struct rtentry;
-#endif
 #include <net/if.h>
 
 #include <netinet/in.h>

diff --git a/print-ppp.c b/print-ppp.c
index 8ee278fd821dfb7d54759b37b536b795c8cc900f..46ade9f6506b0692184fc5c229b77edc3f4c2cf1 100644 (file)
--- a/print-ppp.c
+++ b/print-ppp.c
@@ -21,7 +21,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-ppp.c,v 1.38 2000-05-28 06:29:43 itojun Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-ppp.c,v 1.39 2000-07-01 03:39:08 assar Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -34,10 +34,8 @@ static const char rcsid[] =
 #include <sys/file.h>
 #include <sys/ioctl.h>
 
-#if __STDC__
 struct mbuf;
 struct rtentry;
-#endif
 #include <net/if.h>
 
 #include <netinet/in.h>

diff --git a/print-pppoe.c b/print-pppoe.c
index 406f42549b4b3641922c6f3064f96451e9fb22ea..8a0204641d5d4f24e8e4c22053fa04b65d056f3b 100644 (file)
--- a/print-pppoe.c
+++ b/print-pppoe.c
@@ -21,7 +21,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-"@(#) $Header: /tcpdump/master/tcpdump/print-pppoe.c,v 1.3 1999-12-15 00:23:06 fenner Exp $ (LBL)";
+"@(#) $Header: /tcpdump/master/tcpdump/print-pppoe.c,v 1.4 2000-07-01 03:39:08 assar Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -32,18 +32,13 @@ static const char rcsid[] =
 #include <sys/time.h>
 #include <sys/socket.h>
 
-#if __STDC__
 struct mbuf;
 struct rtentry;
-#endif
 #include <net/if.h>
 
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
 
-#ifdef HAVE_MEMORY_H
-#include <memory.h>
-#endif
 #include <stdio.h>
 #include <string.h>
 

diff --git a/print-raw.c b/print-raw.c
index c7504902e1842babd3d75132b1b6d2d35da0c5a9..dbba479b0dcbe739b14356ade52ec6d6786b2bc5 100644 (file)
--- a/print-raw.c
+++ b/print-raw.c
@@ -21,7 +21,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-raw.c,v 1.25 1999-11-21 09:37:00 fenner Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-raw.c,v 1.26 2000-07-01 03:39:08 assar Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -34,10 +34,8 @@ static const char rcsid[] =
 #include <sys/file.h>
 #include <sys/ioctl.h>
 
-#if __STDC__
 struct mbuf;
 struct rtentry;
-#endif
 #include <net/if.h>
 
 #include <netinet/in.h>

diff --git a/print-rip.c b/print-rip.c
index 8d5363f030e12b5baf696a004f627dc3464a1b39..9f409eebe4b6ce344d9a487d870b77c1f860a1b3 100644 (file)
--- a/print-rip.c
+++ b/print-rip.c
@@ -21,7 +21,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-rip.c,v 1.41 2000-06-18 17:41:35 itojun Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-rip.c,v 1.42 2000-07-01 03:39:09 assar Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -40,6 +40,7 @@ static const char rcsid[] =
 #include <netinet/udp_var.h>
 
 #include <stdio.h>
+#include <ctype.h>
 
 #include "interface.h"
 #include "addrtoname.h"

diff --git a/print-sl.c b/print-sl.c
index a6b4dc9ce9f0aa587f7531589dd037640dd49935..9f2858a01b046e8646837ade659a504ef926201e 100644 (file)
--- a/print-sl.c
+++ b/print-sl.c
@@ -21,7 +21,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-sl.c,v 1.46 1999-11-21 12:38:24 itojun Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-sl.c,v 1.47 2000-07-01 03:39:09 assar Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -37,9 +37,8 @@ static const char rcsid[] =
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 
-#if __STDC__
+struct mbuf;
 struct rtentry;
-#endif
 #include <net/if.h>
 
 #include <netinet/in.h>

diff --git a/print-snmp.c b/print-snmp.c
index 503fc96799fed38ca386331c13aaccd97d6084ff..9b2e7e3a88ca6d4ae6f38ca5cefccaa176d93f5c 100644 (file)
--- a/print-snmp.c
+++ b/print-snmp.c
@@ -45,7 +45,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-snmp.c,v 1.40 2000-01-17 06:24:26 itojun Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-snmp.c,v 1.41 2000-07-01 03:39:09 assar Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -56,9 +56,6 @@ static const char rcsid[] =
 #include <sys/time.h>
 
 #include <ctype.h>
-#ifdef HAVE_MEMORY_H
-#include <memory.h>
-#endif
 #include <stdio.h>
 #include <string.h>
 

diff --git a/print-stp.c b/print-stp.c
index d10111f04525109dc113499d4232e7ba0ff18088..43bf9288be59ba73d85bcce50b4f5db69c1d1706 100644 (file)
--- a/print-stp.c
+++ b/print-stp.c
@@ -11,7 +11,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-stp.c,v 1.2 2000-06-13 12:19:07 assar Exp $";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-stp.c,v 1.3 2000-07-01 03:39:10 assar Exp $";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -31,9 +31,7 @@ static const char rcsid[] =
 #include <netinet/tcp.h>
 #include <netinet/tcpip.h>
 
-#ifdef __STDC__
 #include <stdlib.h>
-#endif
 #include <stdio.h>
 #include <string.h>
 

diff --git a/print-sunrpc.c b/print-sunrpc.c
index 9c2043ecedf9c5b49faee57de8801f709b20f579..d9667a2b53b367e51aeb3b8aff673958030e4ecd 100644 (file)
--- a/print-sunrpc.c
+++ b/print-sunrpc.c
@@ -21,7 +21,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-sunrpc.c,v 1.32 2000-06-10 05:38:00 itojun Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-sunrpc.c,v 1.33 2000-07-01 03:39:10 assar Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -32,10 +32,8 @@ static const char rcsid[] =
 #include <sys/time.h>
 #include <sys/socket.h>
 
-#if __STDC__
 struct mbuf;
 struct rtentry;
-#endif
 #include <net/if.h>
 
 #include <netinet/in.h>

diff --git a/print-tcp.c b/print-tcp.c
index fe8f5eabce82a0f788eee4d3a97be2e56242b6fc..fa2099184bd118d4045ccdde96c208ee83b2fb2c 100644 (file)
--- a/print-tcp.c
+++ b/print-tcp.c
@@ -21,7 +21,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-tcp.c,v 1.66 2000-06-01 01:09:32 assar Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-tcp.c,v 1.67 2000-07-01 03:39:10 assar Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -39,9 +39,6 @@ static const char rcsid[] =
 #include <netinet/ip_var.h>
 #include <netinet/tcp.h>
 
-#ifdef HAVE_MEMORY_H
-#include <memory.h>
-#endif
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

diff --git a/print-telnet.c b/print-telnet.c
index e0db8ee9ea8ae0d7f4ed1252a9994273dba31723..5be7e6f1d386cc4d9089fa47eff5d32a6ac88672 100644 (file)
--- a/print-telnet.c
+++ b/print-telnet.c
@@ -51,7 +51,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-     "@(#) $Header: /tcpdump/master/tcpdump/print-telnet.c,v 1.8 2000-06-03 16:40:35 itojun Exp $";
+     "@(#) $Header: /tcpdump/master/tcpdump/print-telnet.c,v 1.9 2000-07-01 03:39:11 assar Exp $";
 #endif
 
 #include <sys/param.h>
@@ -70,9 +70,7 @@ static const char rcsid[] =
 #include <arpa/telnet.h>
 
 #include <stdio.h>
-#ifdef __STDC__
 #include <stdlib.h>
-#endif
 #include <unistd.h>
 #include <string.h>
 

diff --git a/print-vjc.c b/print-vjc.c
index 120129d2330bf3b5aff2c25e784677bc725548e1..baec41a572067476ae338bd58cb18206756ff45a 100644 (file)
--- a/print-vjc.c
+++ b/print-vjc.c
@@ -27,7 +27,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-vjc.c,v 1.3 2000-01-09 21:34:20 fenner Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-vjc.c,v 1.4 2000-07-01 03:39:11 assar Exp $ (LBL)";
 #endif
 
 #include <sys/param.h>
@@ -36,10 +36,8 @@ static const char rcsid[] =
 #include <sys/file.h>
 #include <sys/ioctl.h>
 
-#if __STDC__
 struct mbuf;
 struct rtentry;
-#endif
 #include <net/if.h>
 
 #include <netinet/in.h>

diff --git a/savestr.c b/savestr.c
index b5cb5150ea166604dde87410d7b494cab366d6f5..e99e3c94112f092d47305ebb1b2ff5122598cfe4 100644 (file)
--- a/savestr.c
+++ b/savestr.c
@@ -21,7 +21,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/Attic/savestr.c,v 1.4 1999-11-21 09:37:04 fenner Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/Attic/savestr.c,v 1.5 2000-07-01 03:39:11 assar Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -30,9 +30,6 @@ static const char rcsid[] =
 
 #include <sys/types.h>
 
-#ifdef HAVE_MALLOC_H
-#include <malloc.h>
-#endif
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

diff --git a/setsignal.c b/setsignal.c
index 058fb15284c57017c4f46249a6abf266ca1a483c..add29792ce7c93118b724c7b43c8ffb243f3fef8 100644 (file)
--- a/setsignal.c
+++ b/setsignal.c
@@ -21,7 +21,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/setsignal.c,v 1.5 1999-11-21 09:37:04 fenner Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/setsignal.c,v 1.6 2000-07-01 03:39:12 assar Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -30,9 +30,6 @@ static const char rcsid[] =
 
 #include <sys/types.h>
 
-#ifdef HAVE_MEMORY_H
-#include <memory.h>
-#endif
 #include <signal.h>
 #ifdef HAVE_SIGACTION
 #include <string.h>

diff --git a/util.c b/util.c
index 7806a9f038db5990366fe18ea1d8d7f130b675d9..c205615a4056de6f695133bd3f74c6deb3e58715 100644 (file)
--- 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) {

diff --git a/vfprintf.c b/vfprintf.c
index 394b23072c73da3a01ebb312eff0593e237e1ecf..7bd3329abbe4d46c5b758e0a376357e760ceafe4 100644 (file)
--- a/vfprintf.c
+++ b/vfprintf.c
@@ -21,7 +21,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/vfprintf.c,v 1.3 1999-11-21 09:37:05 fenner Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/vfprintf.c,v 1.4 2000-07-01 03:39:12 assar Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -31,11 +31,7 @@ static const char rcsid[] =
 #include <sys/types.h>
 
 #include <stdio.h>
-#if __STDC__
 #include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
 #include <stdlib.h>
 #include <unistd.h>