Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/netinet de-__P -- will ANSIfy .c files later.



details:   https://anonhg.NetBSD.org/src/rev/18d8a4b077f0
branches:  trunk
changeset: 573608:18d8a4b077f0
user:      perry <perry%NetBSD.org@localhost>
date:      Wed Feb 02 21:41:55 2005 +0000

description:
de-__P -- will ANSIfy .c files later.

diffstat:

 sys/netinet/igmp.c      |   10 ++--
 sys/netinet/in.c        |   16 +++---
 sys/netinet/in_gif.c    |    8 +-
 sys/netinet/in_pcb.c    |    8 +-
 sys/netinet/ip_encap.c  |   26 +++++------
 sys/netinet/ip_encap.h  |   26 +++++-----
 sys/netinet/ip_gre.c    |    8 +-
 sys/netinet/ip_icmp.c   |   20 ++++----
 sys/netinet/ip_input.c  |   16 +++---
 sys/netinet/ip_mroute.c |  108 +++++++++++++++++++++++------------------------
 sys/netinet/ip_output.c |   11 ++--
 sys/netinet/raw_ip.c    |   18 ++++----
 sys/netinet/tcp_input.c |    9 +--
 sys/netinet/tcp_subr.c  |   18 ++++----
 14 files changed, 148 insertions(+), 154 deletions(-)

diffs (truncated from 709 to 300 lines):

diff -r 332d7f45a948 -r 18d8a4b077f0 sys/netinet/igmp.c
--- a/sys/netinet/igmp.c        Wed Feb 02 21:41:01 2005 +0000
+++ b/sys/netinet/igmp.c        Wed Feb 02 21:41:55 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: igmp.c,v 1.39 2004/11/13 19:17:50 christos Exp $       */
+/*     $NetBSD: igmp.c,v 1.40 2005/02/02 21:41:55 perry Exp $  */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: igmp.c,v 1.39 2004/11/13 19:17:50 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: igmp.c,v 1.40 2005/02/02 21:41:55 perry Exp $");
 
 #include "opt_mrouting.h"
 
@@ -70,9 +70,9 @@
 int igmp_timers_are_running;
 static LIST_HEAD(, router_info) rti_head = LIST_HEAD_INITIALIZER(rti_head);
 
-void igmp_sendpkt __P((struct in_multi *, int));
-static int rti_fill __P((struct in_multi *));
-static struct router_info *rti_find __P((struct ifnet *));
+void igmp_sendpkt(struct in_multi *, int);
+static int rti_fill(struct in_multi *);
+static struct router_info *rti_find(struct ifnet *);
 static void rti_delete(struct ifnet *);
 
 static int
diff -r 332d7f45a948 -r 18d8a4b077f0 sys/netinet/in.c
--- a/sys/netinet/in.c  Wed Feb 02 21:41:01 2005 +0000
+++ b/sys/netinet/in.c  Wed Feb 02 21:41:55 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: in.c,v 1.101 2005/01/24 21:25:09 matt Exp $    */
+/*     $NetBSD: in.c,v 1.102 2005/02/02 21:41:55 perry Exp $   */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -98,7 +98,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: in.c,v 1.101 2005/01/24 21:25:09 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in.c,v 1.102 2005/02/02 21:41:55 perry Exp $");
 
 #include "opt_inet.h"
 #include "opt_inet_conf.h"
@@ -135,13 +135,13 @@
 #endif
 
 #ifdef INET
-static u_int in_mask2len __P((struct in_addr *));
-static void in_len2mask __P((struct in_addr *, u_int));
-static int in_lifaddr_ioctl __P((struct socket *, u_long, caddr_t,
-       struct ifnet *, struct proc *));
+static u_int in_mask2len(struct in_addr *);
+static void in_len2mask(struct in_addr *, u_int);
+static int in_lifaddr_ioctl(struct socket *, u_long, caddr_t,
+       struct ifnet *, struct proc *);
 
-static int in_addprefix __P((struct in_ifaddr *, int));
-static int in_scrubprefix __P((struct in_ifaddr *));
+static int in_addprefix(struct in_ifaddr *, int);
+static int in_scrubprefix(struct in_ifaddr *);
 
 #ifndef SUBNETSARELOCAL
 #define        SUBNETSARELOCAL 1
diff -r 332d7f45a948 -r 18d8a4b077f0 sys/netinet/in_gif.c
--- a/sys/netinet/in_gif.c      Wed Feb 02 21:41:01 2005 +0000
+++ b/sys/netinet/in_gif.c      Wed Feb 02 21:41:55 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: in_gif.c,v 1.38 2005/02/01 12:56:30 he Exp $   */
+/*     $NetBSD: in_gif.c,v 1.39 2005/02/02 21:41:55 perry Exp $        */
 /*     $KAME: in_gif.c,v 1.66 2001/07/29 04:46:09 itojun Exp $ */
 
 /*
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: in_gif.c,v 1.38 2005/02/01 12:56:30 he Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in_gif.c,v 1.39 2005/02/02 21:41:55 perry Exp $");
 
 #include "opt_inet.h"
 #include "opt_iso.h"
@@ -72,8 +72,8 @@
 
 #include <net/net_osdep.h>
 
-static int gif_validate4 __P((const struct ip *, struct gif_softc *,
-       struct ifnet *));
+static int gif_validate4(const struct ip *, struct gif_softc *,
+       struct ifnet *);
 
 #if NGIF > 0
 int ip_gif_ttl = GIF_TTL;
diff -r 332d7f45a948 -r 18d8a4b077f0 sys/netinet/in_pcb.c
--- a/sys/netinet/in_pcb.c      Wed Feb 02 21:41:01 2005 +0000
+++ b/sys/netinet/in_pcb.c      Wed Feb 02 21:41:55 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: in_pcb.c,v 1.96 2004/09/29 21:30:00 christos Exp $     */
+/*     $NetBSD: in_pcb.c,v 1.97 2005/02/02 21:41:55 perry Exp $        */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -98,7 +98,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: in_pcb.c,v 1.96 2004/09/29 21:30:00 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in_pcb.c,v 1.97 2005/02/02 21:41:55 perry Exp $");
 
 #include "opt_inet.h"
 #include "opt_ipsec.h"
@@ -563,7 +563,7 @@
        struct in_addr faddr, laddr;
        u_int fport_arg, lport_arg;
        int errno;
-       void (*notify) __P((struct inpcb *, int));
+       void (*notify)(struct inpcb *, int);
 {
        struct inpcbhead *head;
        struct inpcb *inp, *ninp;
@@ -595,7 +595,7 @@
        struct inpcbtable *table;
        struct in_addr faddr;
        int errno;
-       void (*notify) __P((struct inpcb *, int));
+       void (*notify)(struct inpcb *, int);
 {
        struct inpcb *inp, *ninp;
 
diff -r 332d7f45a948 -r 18d8a4b077f0 sys/netinet/ip_encap.c
--- a/sys/netinet/ip_encap.c    Wed Feb 02 21:41:01 2005 +0000
+++ b/sys/netinet/ip_encap.c    Wed Feb 02 21:41:55 2005 +0000
@@ -70,7 +70,7 @@
 #define USE_RADIX
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip_encap.c,v 1.21 2005/01/24 04:46:49 enami Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_encap.c,v 1.22 2005/02/02 21:41:55 perry Exp $");
 
 #include "opt_mrouting.h"
 #include "opt_inet.h"
@@ -130,25 +130,23 @@
 enum direction { INBOUND, OUTBOUND };
 
 #ifdef INET
-static struct encaptab *encap4_lookup __P((struct mbuf *, int, int,
-       enum direction));
+static struct encaptab *encap4_lookup(struct mbuf *, int, int, enum direction);
 #endif
 #ifdef INET6
-static struct encaptab *encap6_lookup __P((struct mbuf *, int, int,
-       enum direction));
+static struct encaptab *encap6_lookup(struct mbuf *, int, int, enum direction);
 #endif
-static int encap_add __P((struct encaptab *));
-static int encap_remove __P((struct encaptab *));
-static int encap_afcheck __P((int, const struct sockaddr *, const struct sockaddr *));
+static int encap_add(struct encaptab *);
+static int encap_remove(struct encaptab *);
+static int encap_afcheck(int, const struct sockaddr *, const struct sockaddr *);
 #ifdef USE_RADIX
-static struct radix_node_head *encap_rnh __P((int));
-static int mask_matchlen __P((const struct sockaddr *));
+static struct radix_node_head *encap_rnh(int);
+static int mask_matchlen(const struct sockaddr *);
 #endif
 #ifndef USE_RADIX
-static int mask_match __P((const struct encaptab *, const struct sockaddr *,
-               const struct sockaddr *));
+static int mask_match(const struct encaptab *, const struct sockaddr *,
+               const struct sockaddr *);
 #endif
-static void encap_fillarg __P((struct mbuf *, const struct encaptab *));
+static void encap_fillarg(struct mbuf *, const struct encaptab *);
 
 LIST_HEAD(, encaptab) encaptab = LIST_HEAD_INITIALIZER(&encaptab);
 
@@ -668,7 +666,7 @@
 encap_attach_func(af, proto, func, psw, arg)
        int af;
        int proto;
-       int (*func) __P((const struct mbuf *, int, int, void *));
+       int (*func)(const struct mbuf *, int, int, void *);
        const struct protosw *psw;
        void *arg;
 {
diff -r 332d7f45a948 -r 18d8a4b077f0 sys/netinet/ip_encap.h
--- a/sys/netinet/ip_encap.h    Wed Feb 02 21:41:01 2005 +0000
+++ b/sys/netinet/ip_encap.h    Wed Feb 02 21:41:55 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ip_encap.h,v 1.5 2004/08/17 07:05:34 itojun Exp $      */
+/*     $NetBSD: ip_encap.h,v 1.6 2005/02/02 21:41:55 perry Exp $       */
 /*     $KAME: ip_encap.h,v 1.7 2000/03/25 07:23:37 sumikawa Exp $      */
 
 /*
@@ -55,19 +55,19 @@
        void *arg;                      /* passed via PACKET_TAG_ENCAP */
 };
 
-void   encap_setkeylen __P((void));
-void   encap_init __P((void));
-void   encap4_input __P((struct mbuf *, ...));
-int    encap6_input __P((struct mbuf **, int *, int));
-const struct encaptab *encap_attach __P((int, int, const struct sockaddr *,
+void   encap_setkeylen(void);
+void   encap_init(void);
+void   encap4_input(struct mbuf *, ...);
+int    encap6_input(struct mbuf **, int *, int);
+const struct encaptab *encap_attach(int, int, const struct sockaddr *,
        const struct sockaddr *, const struct sockaddr *,
-       const struct sockaddr *, const struct protosw *, void *));
-const struct encaptab *encap_attach_func __P((int, int,
-       int (*) __P((const struct mbuf *, int, int, void *)),
-       const struct protosw *, void *));
-void   encap6_ctlinput __P((int, struct sockaddr *, void *));
-int    encap_detach __P((const struct encaptab *));
-void   *encap_getarg __P((struct mbuf *));
+       const struct sockaddr *, const struct protosw *, void *);
+const struct encaptab *encap_attach_func(int, int,
+       int (*)(const struct mbuf *, int, int, void *),
+       const struct protosw *, void *);
+void   encap6_ctlinput(int, struct sockaddr *, void *);
+int    encap_detach(const struct encaptab *);
+void   *encap_getarg(struct mbuf *);
 #endif
 
 #endif /*_NETINET_IP_ENCAP_H_*/
diff -r 332d7f45a948 -r 18d8a4b077f0 sys/netinet/ip_gre.c
--- a/sys/netinet/ip_gre.c      Wed Feb 02 21:41:01 2005 +0000
+++ b/sys/netinet/ip_gre.c      Wed Feb 02 21:41:55 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ip_gre.c,v 1.30 2004/04/26 01:31:56 matt Exp $ */
+/*     $NetBSD: ip_gre.c,v 1.31 2005/02/02 21:41:55 perry Exp $ */
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -43,7 +43,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip_gre.c,v 1.30 2004/04/26 01:31:56 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_gre.c,v 1.31 2005/02/02 21:41:55 perry Exp $");
 
 #include "gre.h"
 #if NGRE > 0
@@ -102,9 +102,9 @@
 void gre_inet_ntoa(struct in_addr in);         /* XXX */
 #endif
 
-struct gre_softc *gre_lookup __P((struct mbuf *, u_int8_t));
+struct gre_softc *gre_lookup(struct mbuf *, u_int8_t);
 
-int    gre_input2 __P((struct mbuf *, int, u_char));
+int    gre_input2(struct mbuf *, int, u_char);
 
 /*
  * De-encapsulate a packet and feed it back through ip input (this
diff -r 332d7f45a948 -r 18d8a4b077f0 sys/netinet/ip_icmp.c
--- a/sys/netinet/ip_icmp.c     Wed Feb 02 21:41:01 2005 +0000
+++ b/sys/netinet/ip_icmp.c     Wed Feb 02 21:41:55 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ip_icmp.c,v 1.88 2005/01/24 21:25:09 matt Exp $        */
+/*     $NetBSD: ip_icmp.c,v 1.89 2005/02/02 21:41:55 perry Exp $       */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -101,7 +101,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip_icmp.c,v 1.88 2005/01/24 21:25:09 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_icmp.c,v 1.89 2005/02/02 21:41:55 perry Exp $");
 
 #include "opt_ipsec.h"
 
@@ -159,16 +159,16 @@
  */
 struct icmp_mtudisc_callback {
        LIST_ENTRY(icmp_mtudisc_callback) mc_list;
-       void (*mc_func) __P((struct in_addr));
+       void (*mc_func)(struct in_addr);
 };
 
 LIST_HEAD(, icmp_mtudisc_callback) icmp_mtudisc_callbacks =
     LIST_HEAD_INITIALIZER(&icmp_mtudisc_callbacks);
 
 #if 0
-static int     ip_next_mtu __P((int, int));
+static int     ip_next_mtu(int, int);
 #else
-/*static*/ int ip_next_mtu __P((int, int));
+/*static*/ int ip_next_mtu(int, int);
 #endif
 
 extern int icmperrppslim;



Home | Main Index | Thread Index | Old Index