Eliminate __P().

diff --git a/FILES b/FILES
index d561cd66bb45ecf4a4d981c519d9547ddb169fd4..84210fe2bfac4853c927b46845862dca2576de6c 100644 (file)
--- a/FILES
+++ b/FILES
@@ -63,7 +63,6 @@ mib.h
 missing/addrinfo.h
 missing/addrsize.h
 missing/bittypes.h
 missing/addrinfo.h
 missing/addrsize.h
 missing/bittypes.h

-missing/cdecl_ext.h

 missing/getaddrinfo.c
 missing/getnameinfo.c
 missing/inet_aton.c
 missing/getaddrinfo.c
 missing/getnameinfo.c
 missing/inet_aton.c

diff --git a/acconfig.h b/acconfig.h
index 57cc38e96b6f3762ec193f9b8b42c3f9a4c6b6a8..6a033871e0bccd1ebe0d6943e9a04e1c35cc5456 100644 (file)
--- a/acconfig.h
+++ b/acconfig.h
@@ -2,15 +2,6 @@
  * make them to acconfig.h and rerun autoheader */
 @TOP@
 
  * make them to acconfig.h and rerun autoheader */
 @TOP@
 

-/* Define __P() macro, if necessary */
-#ifndef __P
-#if __STDC__
-#define __P(protos) protos
-#else
-#define __P(protos) ()
-#endif
-#endif
-

 /* Define if you have SSLeay 0.9.0b with the buggy cast128. */
 #undef HAVE_BUGGY_CAST128
 
 /* Define if you have SSLeay 0.9.0b with the buggy cast128. */
 #undef HAVE_BUGGY_CAST128
 

diff --git a/config.h.in b/config.h.in
index 6be88e2bd665209584b5d837509b200cdec73426..650d3f7c9560e5e0e2d81bfa66a861ef389d2a11 100644 (file)
--- a/config.h.in
+++ b/config.h.in
@@ -18,15 +18,6 @@
    byte first (like Motorola and SPARC, unlike Intel and VAX).  */
 #undef WORDS_BIGENDIAN
 
    byte first (like Motorola and SPARC, unlike Intel and VAX).  */
 #undef WORDS_BIGENDIAN
 

-/* Define __P() macro, if necessary */
-#ifndef __P
-#if __STDC__
-#define __P(protos) protos
-#else
-#define __P(protos) ()
-#endif
-#endif
-

 /* Define if you have SSLeay 0.9.0b with the buggy cast128. */
 #undef HAVE_BUGGY_CAST128
 
 /* Define if you have SSLeay 0.9.0b with the buggy cast128. */
 #undef HAVE_BUGGY_CAST128
 


@@ -60,9 +51,6 @@
 /* define if this is a development version, to use additional prototypes. */
 #undef HAVE_OS_PROTO_H
 
 /* define if this is a development version, to use additional prototypes. */
 #undef HAVE_OS_PROTO_H
 

-/* define if <unistd.h> defines __P() */
-#undef HAVE_PORTABLE_PROTOTYPE
-

 /* define if RES_USE_INET6 is defined */
 #undef HAVE_RES_USE_INET6
 
 /* define if RES_USE_INET6 is defined */
 #undef HAVE_RES_USE_INET6
 

diff --git a/configure.in b/configure.in
index ae9fb061d1a00b49ed0979cf6f7126d820fc4081..6fb7c4aded00d6709d363b5c0abd534068573ea6 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl @(#) $Header: /tcpdump/master/tcpdump/configure.in,v 1.128 2000-10-21 04:54:26 guy Exp $ (LBL)
+dnl @(#) $Header: /tcpdump/master/tcpdump/configure.in,v 1.129 2000-10-24 00:56:49 fenner Exp $ (LBL)

 dnl
 dnl Copyright (c) 1994, 1995, 1996, 1997
 dnl    The Regents of the University of California.  All rights reserved.
 dnl
 dnl Copyright (c) 1994, 1995, 1996, 1997
 dnl    The Regents of the University of California.  All rights reserved.


@@ -6,7 +6,7 @@ dnl
 dnl Process this file with autoconf to produce a configure script.
 dnl
 
 dnl Process this file with autoconf to produce a configure script.
 dnl
 

-AC_REVISION($Revision: 1.128 $)
+AC_REVISION($Revision: 1.129 $)

 AC_PREREQ(2.13)
 AC_INIT(tcpdump.c)
 
 AC_PREREQ(2.13)
 AC_INIT(tcpdump.c)
 


@@ -374,13 +374,6 @@ if test "$ac_cv_sockaddr_has_sa_len" = no; then
        missing_includes=yes
 fi
 
        missing_includes=yes
 fi
 

-dnl
-dnl check __P macro
-AC_CHECK_PORTABLE_PROTO(ac_cv_portable_proto)
-if test "$ac_cv_portable_proto" = no; then
-       missing_includes=yes
-fi
-

 dnl
 dnl check sizeof basic types.
 dnl They're very likely to be wrong for cross-compiling.
 dnl
 dnl check sizeof basic types.
 dnl They're very likely to be wrong for cross-compiling.

diff --git a/dhcp6opt.h b/dhcp6opt.h
index a9177c64227e525b774467ca7d8fa0fc646fe981..3e39a6db43fe05e4f3848a7d3896a0efcc4d8fa3 100644 (file)
--- a/dhcp6opt.h
+++ b/dhcp6opt.h
@@ -72,9 +72,9 @@ struct dhcp6_opt {
 extern struct dhcp6_opt *dh6o_pad;
 extern struct dhcp6_opt *dh6o_end;
 extern int dhcp6_param[];
 extern struct dhcp6_opt *dh6o_pad;
 extern struct dhcp6_opt *dh6o_end;
 extern int dhcp6_param[];

-extern void dhcp6opttab_init __P((void));
-extern struct dhcp6_opt *dhcp6opttab_byname __P((char *));
-extern struct dhcp6_opt *dhcp6opttab_bycode __P((u_int));
+extern void dhcp6opttab_init (void);
+extern struct dhcp6_opt *dhcp6opttab_byname (char *);
+extern struct dhcp6_opt *dhcp6opttab_bycode (u_int);

 #endif
 
 #endif /*__DHCP6OPT_H_DEFINED*/
 #endif
 
 #endif /*__DHCP6OPT_H_DEFINED*/

diff --git a/interface.h b/interface.h
index efe5075eddac844de82901423c7657cdd065fe4b..d81b309d8b25e5e20abad1b2beb14be1a9a1f101 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.
  *
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *

- * @(#) $Header: /tcpdump/master/tcpdump/interface.h,v 1.140 2000-10-06 06:49:21 guy Exp $ (LBL)
+ * @(#) $Header: /tcpdump/master/tcpdump/interface.h,v 1.141 2000-10-24 00:56:49 fenner Exp $ (LBL)

  */
 
 #ifndef tcpdump_interface_h
  */
 
 #ifndef tcpdump_interface_h


@@ -69,10 +69,10 @@ int vasnprintf (char **ret, size_t max_sz, const char *format, va_list ap)
 #endif
 
 #ifndef HAVE_STRLCAT
 #endif
 
 #ifndef HAVE_STRLCAT

-extern size_t strlcat __P((char *, const char *, size_t));
+extern size_t strlcat (char *, const char *, size_t);

 #endif
 #ifndef HAVE_STRLCPY
 #endif
 #ifndef HAVE_STRLCPY

-extern size_t strlcpy __P((char *, const char *, size_t));
+extern size_t strlcpy (char *, const char *, size_t);

 #endif
 
 struct tok {
 #endif
 
 struct tok {

diff --git a/linux-include/netinet/in_systm.h b/linux-include/netinet/in_systm.h
index d9a7c3e233641046562c11575fe72df4dedb9025..935daae621ed2699ed33d06f80a76d7477f80c62 100644 (file)
--- a/linux-include/netinet/in_systm.h
+++ b/linux-include/netinet/in_systm.h
@@ -52,5 +52,5 @@ typedef u_int n_long;                 /* long as received from the net */
 typedef        u_int   n_time;                 /* ms since 00:00 GMT, byte rev */
 
 #ifdef KERNEL
 typedef        u_int   n_time;                 /* ms since 00:00 GMT, byte rev */
 
 #ifdef KERNEL

-n_time  iptime __P((void));
+n_time  iptime (void);

 #endif
 #endif

diff --git a/linux-include/netinet/ip_icmp.h b/linux-include/netinet/ip_icmp.h
index 59944423303c4da5cb808b1ee3e67a641ad90479..c271d0df9f3c593f1976fe684e6a669babd276e4 100644 (file)
--- a/linux-include/netinet/ip_icmp.h
+++ b/linux-include/netinet/ip_icmp.h
@@ -152,9 +152,9 @@ struct icmp {
        (type) == ICMP_MASKREQ || (type) == ICMP_MASKREPLY)
 
 #ifdef KERNEL
        (type) == ICMP_MASKREQ || (type) == ICMP_MASKREPLY)
 
 #ifdef KERNEL

-void   icmp_error __P((struct mbuf *, int, int, n_int, struct ifnet *));
-void   icmp_input __P((struct mbuf *, int));
-void   icmp_reflect __P((struct mbuf *));
-void   icmp_send __P((struct mbuf *, struct mbuf *));
-int    icmp_sysctl __P((int *, u_int, void *, size_t *, void *, size_t));
+void   icmp_error (struct mbuf *, int, int, n_int, struct ifnet *);
+void   icmp_input (struct mbuf *, int);
+void   icmp_reflect (struct mbuf *);
+void   icmp_send (struct mbuf *, struct mbuf *);
+int    icmp_sysctl (int *, u_int, void *, size_t *, void *, size_t);

 #endif
 #endif

diff --git a/linux-include/netinet/ip_var.h b/linux-include/netinet/ip_var.h
index ce116518ba89eacaa8c49caa9be0f91263b37536..f2ce7eae378ea84b81c50c58f519eac9a2711967 100644 (file)
--- a/linux-include/netinet/ip_var.h
+++ b/linux-include/netinet/ip_var.h
@@ -142,37 +142,37 @@ struct    ipq     ipq;                    /* ip reass. queue */
 u_short        ip_id;                          /* ip packet ctr, for ids */
 int    ip_defttl;                      /* default IP ttl */
 
 u_short        ip_id;                          /* ip packet ctr, for ids */
 int    ip_defttl;                      /* default IP ttl */
 

-int     in_control __P((struct socket *, n_long, caddr_t, struct ifnet *));
-int     ip_ctloutput __P((int, struct socket *, int, int, struct mbuf **));
-void    ip_deq __P((struct ipasfrag *));
-int     ip_dooptions __P((struct mbuf *));
-void    ip_drain __P((void));
-void    ip_enq __P((struct ipasfrag *, struct ipasfrag *));
-void    ip_forward __P((struct mbuf *, int));
-void    ip_freef __P((struct ipq *));
-void    ip_freemoptions __P((struct ip_moptions *));
-int     ip_getmoptions __P((int, struct ip_moptions *, struct mbuf **));
-void    ip_init __P((void));
-int     ip_mforward __P((struct mbuf *, struct ifnet *));
-int     ip_optcopy __P((struct ip *, struct ip *));
-int     ip_output __P((struct mbuf *,
-           struct mbuf *, struct route *, int, struct ip_moptions *));
-int     ip_pcbopts __P((struct mbuf **, struct mbuf *));
+int     in_control (struct socket *, n_long, caddr_t, struct ifnet *);
+int     ip_ctloutput (int, struct socket *, int, int, struct mbuf **);
+void    ip_deq (struct ipasfrag *);
+int     ip_dooptions (struct mbuf *);
+void    ip_drain (void);
+void    ip_enq (struct ipasfrag *, struct ipasfrag *);
+void    ip_forward (struct mbuf *, int);
+void    ip_freef (struct ipq *);
+void    ip_freemoptions (struct ip_moptions *);
+int     ip_getmoptions (int, struct ip_moptions *, struct mbuf **);
+void    ip_init (void);
+int     ip_mforward (struct mbuf *, struct ifnet *);
+int     ip_optcopy (struct ip *, struct ip *);
+int     ip_output (struct mbuf *,
+           struct mbuf *, struct route *, int, struct ip_moptions *);
+int     ip_pcbopts (struct mbuf **, struct mbuf *);

 struct ip *
 struct ip *

-        ip_reass __P((struct ipasfrag *, struct ipq *));
+        ip_reass (struct ipasfrag *, struct ipq *);

 struct in_ifaddr *
 struct in_ifaddr *

-        ip_rtaddr __P((struct in_addr));
-int     ip_setmoptions __P((int, struct ip_moptions **, struct mbuf *));
-void    ip_slowtimo __P((void));
+        ip_rtaddr (struct in_addr);
+int     ip_setmoptions (int, struct ip_moptions **, struct mbuf *);
+void    ip_slowtimo (void);

 struct mbuf *
 struct mbuf *

-        ip_srcroute __P((void));
-void    ip_stripoptions __P((struct mbuf *, struct mbuf *));
-int     ip_sysctl __P((int *, n_long, void *, size_t *, void *, size_t));
-void    ipintr __P((void));
-int     rip_ctloutput __P((int, struct socket *, int, int, struct mbuf **));
-void    rip_init __P((void));
-void    rip_input __P((struct mbuf *));
-int     rip_output __P((struct mbuf *, struct socket *, n_long));
-int     rip_usrreq __P((struct socket *,
-           int, struct mbuf *, struct mbuf *, struct mbuf *));
+        ip_srcroute (void);
+void    ip_stripoptions (struct mbuf *, struct mbuf *);
+int     ip_sysctl (int *, n_long, void *, size_t *, void *, size_t);
+void    ipintr (void);
+int     rip_ctloutput (int, struct socket *, int, int, struct mbuf **);
+void    rip_init (void);
+void    rip_input (struct mbuf *);
+int     rip_output (struct mbuf *, struct socket *, n_long);
+int     rip_usrreq (struct socket *,
+           int, struct mbuf *, struct mbuf *, struct mbuf *);

 #endif
 #endif

diff --git a/linux-include/netinet/tcp_var.h b/linux-include/netinet/tcp_var.h
index e94ccd65e062e9f6c033cedd8216495a709812ac..73a4220259f7f2d92d9e52142b7cfbd8ebb5d62f 100644 (file)
--- a/linux-include/netinet/tcp_var.h
+++ b/linux-include/netinet/tcp_var.h
@@ -238,43 +238,43 @@ struct    inpcb tcb;              /* head of queue of active tcpcb's */
 struct tcpstat tcpstat;        /* tcp statistics */
 n_long tcp_now;                /* for RFC 1323 timestamps */
 
 struct tcpstat tcpstat;        /* tcp statistics */
 n_long tcp_now;                /* for RFC 1323 timestamps */
 

-int     tcp_attach __P((struct socket *));
-void    tcp_canceltimers __P((struct tcpcb *));
+int     tcp_attach (struct socket *);
+void    tcp_canceltimers (struct tcpcb *);

 struct tcpcb *
 struct tcpcb *

-        tcp_close __P((struct tcpcb *));
-void    tcp_ctlinput __P((int, struct sockaddr *, struct ip *));
-int     tcp_ctloutput __P((int, struct socket *, int, int, struct mbuf **));
+        tcp_close (struct tcpcb *);
+void    tcp_ctlinput (int, struct sockaddr *, struct ip *);
+int     tcp_ctloutput (int, struct socket *, int, int, struct mbuf **);

 struct tcpcb *
 struct tcpcb *

-        tcp_disconnect __P((struct tcpcb *));
+        tcp_disconnect (struct tcpcb *);

 struct tcpcb *
 struct tcpcb *

-        tcp_drop __P((struct tcpcb *, int));
-void    tcp_dooptions __P((struct tcpcb *,
-           u_char *, int, struct tcpiphdr *, int *, n_long *, n_long *));
-void    tcp_drain __P((void));
-void    tcp_fasttimo __P((void));
-void    tcp_init __P((void));
-void    tcp_input __P((struct mbuf *, int));
-int     tcp_mss __P((struct tcpcb *, u_int));
+        tcp_drop (struct tcpcb *, int);
+void    tcp_dooptions (struct tcpcb *,
+           u_char *, int, struct tcpiphdr *, int *, n_long *, n_long *);
+void    tcp_drain (void);
+void    tcp_fasttimo (void);
+void    tcp_init (void);
+void    tcp_input (struct mbuf *, int);
+int     tcp_mss (struct tcpcb *, u_int);

 struct tcpcb *
 struct tcpcb *

-        tcp_newtcpcb __P((struct inpcb *));
-void    tcp_notify __P((struct inpcb *, int));
-int     tcp_output __P((struct tcpcb *));
-void    tcp_pulloutofband __P((struct socket *,
-           struct tcpiphdr *, struct mbuf *));
-void    tcp_quench __P((struct inpcb *, int));
-int     tcp_reass __P((struct tcpcb *, struct tcpiphdr *, struct mbuf *));
-void    tcp_respond __P((struct tcpcb *,
-           struct tcpiphdr *, struct mbuf *, n_long, n_long, int));
-void    tcp_setpersist __P((struct tcpcb *));
-void    tcp_slowtimo __P((void));
+        tcp_newtcpcb (struct inpcb *);
+void    tcp_notify (struct inpcb *, int);
+int     tcp_output (struct tcpcb *);
+void    tcp_pulloutofband (struct socket *,
+           struct tcpiphdr *, struct mbuf *);
+void    tcp_quench (struct inpcb *, int);
+int     tcp_reass (struct tcpcb *, struct tcpiphdr *, struct mbuf *);
+void    tcp_respond (struct tcpcb *,
+           struct tcpiphdr *, struct mbuf *, n_long, n_long, int);
+void    tcp_setpersist (struct tcpcb *);
+void    tcp_slowtimo (void);

 struct tcpiphdr *
 struct tcpiphdr *

-        tcp_template __P((struct tcpcb *));
+        tcp_template (struct tcpcb *);

 struct tcpcb *
 struct tcpcb *

-        tcp_timers __P((struct tcpcb *, int));
-void    tcp_trace __P((int, int, struct tcpcb *, struct tcpiphdr *, int));
+        tcp_timers (struct tcpcb *, int);
+void    tcp_trace (int, int, struct tcpcb *, struct tcpiphdr *, int);

 struct tcpcb *
 struct tcpcb *

-        tcp_usrclosed __P((struct tcpcb *));
-int     tcp_usrreq __P((struct socket *,
-           int, struct mbuf *, struct mbuf *, struct mbuf *));
-void    tcp_xmit_timer __P((struct tcpcb *, int));
+        tcp_usrclosed (struct tcpcb *);
+int     tcp_usrreq (struct socket *,
+           int, struct mbuf *, struct mbuf *, struct mbuf *);
+void    tcp_xmit_timer (struct tcpcb *, int);

 #endif
 #endif

diff --git a/linux-include/netinet/udp_var.h b/linux-include/netinet/udp_var.h
index 83b76646a3f4add85a54569b9b1940daf695331c..23b1f368631cc38774d191b2fcb7bef8e6328f33 100644 (file)
--- a/linux-include/netinet/udp_var.h
+++ b/linux-include/netinet/udp_var.h
@@ -81,12 +81,12 @@ struct      udpstat {
 struct inpcb udb;
 struct udpstat udpstat;
 
 struct inpcb udb;
 struct udpstat udpstat;
 

-void    udp_ctlinput __P((int, struct sockaddr *, struct ip *));
-void    udp_init __P((void));
-void    udp_input __P((struct mbuf *, int));
-int     udp_output __P((struct inpcb *,
-           struct mbuf *, struct mbuf *, struct mbuf *));
-int     udp_sysctl __P((int *, u_int, void *, size_t *, void *, size_t));
-int     udp_usrreq __P((struct socket *,
-           int, struct mbuf *, struct mbuf *, struct mbuf *));
+void    udp_ctlinput (int, struct sockaddr *, struct ip *);
+void    udp_init (void);
+void    udp_input (struct mbuf *, int);
+int     udp_output (struct inpcb *,
+           struct mbuf *, struct mbuf *, struct mbuf *);
+int     udp_sysctl (int *, u_int, void *, size_t *, void *, size_t);
+int     udp_usrreq (struct socket *,
+           int, struct mbuf *, struct mbuf *, struct mbuf *);

 #endif
 #endif

diff --git a/missing/addrinfo.h b/missing/addrinfo.h
index 3fd473d1eb1bd54e56aa5740d3f2cb184fb996a4..169c3242dd87ea970f654711dc2ae043fb98fdd3 100644 (file)
--- a/missing/addrinfo.h
+++ b/missing/addrinfo.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  */
 
  * SUCH DAMAGE.
  */
 

-/* $Id: addrinfo.h,v 1.2 1999-11-21 01:35:41 assar Exp $ */
+/* $Id: addrinfo.h,v 1.3 2000-10-24 00:56:52 fenner Exp $ */

 
 #ifndef HAVE_ADDRINFO
 
 
 #ifndef HAVE_ADDRINFO
 


@@ -79,17 +79,17 @@ struct addrinfo {
        struct addrinfo *ai_next;       /* next structure in linked list */
 };
 
        struct addrinfo *ai_next;       /* next structure in linked list */
 };
 

-extern void freeaddrinfo __P((struct addrinfo *));
-extern void freehostent __P((struct hostent *));
-extern char *gai_strerror __P((int));
-extern int getaddrinfo __P((const char *, const char *,
-                           const struct addrinfo *, struct addrinfo **));
-extern int getnameinfo __P((const struct sockaddr *, size_t, char *,
-                           size_t, char *, size_t, int));
-extern struct hostent *getipnodebyaddr __P((const void *, size_t, int, int *));
-extern struct hostent *getipnodebyname __P((const char *, int, int, int *));
-extern int inet_pton __P((int, const char *, void *));
-extern const char *inet_ntop __P((int, const void *, char *, size_t));
+extern void freeaddrinfo (struct addrinfo *);
+extern void freehostent (struct hostent *);
+extern char *gai_strerror (int);
+extern int getaddrinfo (const char *, const char *,
+                           const struct addrinfo *, struct addrinfo **);
+extern int getnameinfo (const struct sockaddr *, size_t, char *,
+                           size_t, char *, size_t, int);
+extern struct hostent *getipnodebyaddr (const void *, size_t, int, int *);
+extern struct hostent *getipnodebyname (const char *, int, int, int *);
+extern int inet_pton (int, const char *, void *);
+extern const char *inet_ntop (int, const void *, char *, size_t);

 #endif /* HAVE_ADDRINFO */
 
 /*
 #endif /* HAVE_ADDRINFO */
 
 /*

diff --git a/missing/cdecl_ext.h b/missing/cdecl_ext.h
deleted file mode 100644 (file)
index 9591db2..0000000
--- a/missing/cdecl_ext.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 1999 WIDE Project.
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the project nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-#ifndef HAVE_PORTABLE_PROTOTYPE
-
-#if defined(__STDC__) || defined(__cplusplus)
-#define        __P(protos)     protos          /* full-blown ANSI C */
-#else
-#define        __P(protos)     ()              /* traditional C preprocessor */
-#endif
-
-#endif /* !HAVE_PORTABLE_PROTOTYPE */

diff --git a/missing/getaddrinfo.c b/missing/getaddrinfo.c
index dd126bc242bb7a335c0e1cbc6e8a58208975bc20..09d39f9e5678234463029788f01e30069dcdaf9e 100644 (file)
--- a/missing/getaddrinfo.c
+++ b/missing/getaddrinfo.c
@@ -51,7 +51,7 @@
 
 #ifndef lint
 static const char rcsid[] =
 
 #ifndef lint
 static const char rcsid[] =

-     "@(#) $Header: /tcpdump/master/tcpdump/missing/getaddrinfo.c,v 1.9 2000-01-21 04:06:18 itojun Exp $";
+     "@(#) $Header: /tcpdump/master/tcpdump/missing/getaddrinfo.c,v 1.10 2000-10-24 00:56:53 fenner Exp $";

 #endif
 
 #include <sys/types.h>
 #endif
 
 #include <sys/types.h>


@@ -74,10 +74,6 @@ static const char rcsid[] =
 #include <stdio.h>
 #include <errno.h>
 
 #include <stdio.h>
 #include <errno.h>
 

-#ifndef HAVE_PORTABLE_PROTOTYPE
-#include "cdecl_ext.h"
-#endif 
-

 #ifndef HAVE_U_INT32_T
 #include "bittypes.h"
 #endif 
 #ifndef HAVE_U_INT32_T
 #include "bittypes.h"
 #endif 


@@ -175,24 +171,24 @@ static const struct explore explore[] = {
 #endif
 
 
 #endif
 
 

-static int str_isnumber __P((const char *));
-static int explore_fqdn __P((const struct addrinfo *, const char *,
-       const char *, struct addrinfo **));
-static int explore_null __P((const struct addrinfo *, const char *,
-       const char *, struct addrinfo **));
-static int explore_numeric __P((const struct addrinfo *, const char *,
-       const char *, struct addrinfo **));
-static int explore_numeric_scope __P((const struct addrinfo *, const char *,
-       const char *, struct addrinfo **));
-static int get_name __P((const char *, const struct afd *, struct addrinfo **,
-       char *, const struct addrinfo *, const char *));
-static int get_canonname __P((const struct addrinfo *,
-       struct addrinfo *, const char *));
-static struct addrinfo *get_ai __P((const struct addrinfo *,
-       const struct afd *, const char *));
-static int get_portmatch __P((const struct addrinfo *, const char *));
-static int get_port __P((struct addrinfo *, const char *, int));
-static const struct afd *find_afd __P((int));
+static int str_isnumber (const char *);
+static int explore_fqdn (const struct addrinfo *, const char *,
+       const char *, struct addrinfo **);
+static int explore_null (const struct addrinfo *, const char *,
+       const char *, struct addrinfo **);
+static int explore_numeric (const struct addrinfo *, const char *,
+       const char *, struct addrinfo **);
+static int explore_numeric_scope (const struct addrinfo *, const char *,
+       const char *, struct addrinfo **);
+static int get_name (const char *, const struct afd *, struct addrinfo **,
+       char *, const struct addrinfo *, const char *);
+static int get_canonname (const struct addrinfo *,
+       struct addrinfo *, const char *);
+static struct addrinfo *get_ai (const struct addrinfo *,
+       const struct afd *, const char *);
+static int get_portmatch (const struct addrinfo *, const char *);
+static int get_port (struct addrinfo *, const char *, int);
+static const struct afd *find_afd (int);

 
 static char *ai_errlist[] = {
        "Success",
 
 static char *ai_errlist[] = {
        "Success",

diff --git a/missing/getnameinfo.c b/missing/getnameinfo.c
index 01bd836407f62686334870aa00af6ca8390b678b..d5e06391d8d20f1d5b6d4c84642ca1bbf3c0819d 100644 (file)
--- a/missing/getnameinfo.c
+++ b/missing/getnameinfo.c
@@ -43,7 +43,7 @@
 
 #ifndef lint
 static const char rcsid[] =
 
 #ifndef lint
 static const char rcsid[] =

-     "@(#) $Header: /tcpdump/master/tcpdump/missing/getnameinfo.c,v 1.7 2000-10-07 05:20:24 itojun Exp $";
+     "@(#) $Header: /tcpdump/master/tcpdump/missing/getnameinfo.c,v 1.8 2000-10-24 00:56:53 fenner Exp $";

 #endif
 
 #include <sys/types.h>
 #endif
 
 #include <sys/types.h>


@@ -58,10 +58,6 @@ static const char rcsid[] =
 #include <stddef.h>
 #include <errno.h>
 
 #include <stddef.h>
 #include <errno.h>
 

-#ifndef HAVE_PORTABLE_PROTOTYPE
-#include "cdecl_ext.h"
-#endif 
-

 #ifdef NEED_ADDRINFO_H
 #include "addrinfo.h"
 #endif
 #ifdef NEED_ADDRINFO_H
 #include "addrinfo.h"
 #endif

diff --git a/print-dhcp6.c b/print-dhcp6.c
index 12fde96d89eb4403219070c6690018b566ececda..8a22bf589229606fd1a650d98037506097418e31 100644 (file)
--- a/print-dhcp6.c
+++ b/print-dhcp6.c
@@ -29,7 +29,7 @@
 
 #ifndef lint
 static const char rcsid[] =
 
 #ifndef lint
 static const char rcsid[] =

-    "@(#) $Header: /tcpdump/master/tcpdump/print-dhcp6.c,v 1.11 2000-09-28 06:42:57 guy Exp $";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-dhcp6.c,v 1.12 2000-10-24 00:56:50 fenner Exp $";

 #endif
 
 #ifdef HAVE_CONFIG_H
 #endif
 
 #ifdef HAVE_CONFIG_H


@@ -56,10 +56,10 @@ struct rtentry;
 #include "dhcp6opt.h"
 
 #if 0
 #include "dhcp6opt.h"
 
 #if 0

-static void dhcp6opttab_init __P((void));
-static struct dhcp6_opt *dhcp6opttab_byname __P((char *));
+static void dhcp6opttab_init (void);
+static struct dhcp6_opt *dhcp6opttab_byname (char *);

 #endif
 #endif

-static struct dhcp6_opt *dhcp6opttab_bycode __P((u_int));
+static struct dhcp6_opt *dhcp6opttab_bycode (u_int);

 
 static char tstr[] = " [|dhcp6]";
 
 
 static char tstr[] = " [|dhcp6]";
 

diff --git a/print-ppp.c b/print-ppp.c
index ff7ac829e44a49826d4a22dbb1aa78f070f00e27..f52d85cbb4a428c1361c06a0fac25fad1cf6dad2 100644 (file)
--- a/print-ppp.c
+++ b/print-ppp.c
@@ -31,7 +31,7 @@
 
 #ifndef lint
 static const char rcsid[] =
 
 #ifndef lint
 static const char rcsid[] =

-    "@(#) $Header: /tcpdump/master/tcpdump/print-ppp.c,v 1.54 2000-10-09 01:53:20 guy Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-ppp.c,v 1.55 2000-10-24 00:56:50 fenner Exp $ (LBL)";

 #endif
 
 #ifdef HAVE_CONFIG_H
 #endif
 
 #ifdef HAVE_CONFIG_H


@@ -324,16 +324,16 @@ static const char *papcode[] = {
 #define BAP_CSIND      7
 #define BAP_CSRES      8
 
 #define BAP_CSIND      7
 #define BAP_CSRES      8
 

-static const char *ppp_protoname __P((u_int proto));
-static void handle_ctrl_proto __P((u_int proto,const u_char *p, int length));
-static void handle_chap __P((const u_char *p, int length));
-static void handle_pap __P((const u_char *p, int length));
-static void handle_bap __P((const u_char *p, int length));
-static int print_lcp_config_options __P((const u_char *p, int));
-static int print_ipcp_config_options __P((const u_char *p, int));
-static int print_ccp_config_options __P((const u_char *p, int));
-static int print_bacp_config_options __P((const u_char *p, int));
-static void handle_ppp __P((u_int proto, const u_char *p, int length));
+static const char *ppp_protoname (u_int proto);
+static void handle_ctrl_proto (u_int proto,const u_char *p, int length);
+static void handle_chap (const u_char *p, int length);
+static void handle_pap (const u_char *p, int length);
+static void handle_bap (const u_char *p, int length);
+static int print_lcp_config_options (const u_char *p, int);
+static int print_ipcp_config_options (const u_char *p, int);
+static int print_ccp_config_options (const u_char *p, int);
+static int print_bacp_config_options (const u_char *p, int);
+static void handle_ppp (u_int proto, const u_char *p, int length);

 
 static const char *
 ppp_protoname(u_int proto)
 
 static const char *
 ppp_protoname(u_int proto)