[src/trunk]: src/sys/netinet ANSIfy function declarations

[perry <perry%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/3c661d208ca0
branches:  trunk
changeset: 573642:3c661d208ca0
user:      perry <perry%NetBSD.org@localhost>
date:      Thu Feb 03 23:13:20 2005 +0000

description:
ANSIfy function declarations

diffstat:

 sys/netinet/ip_output.c |  51 +++++++++++++-----------------------------------
 sys/netinet/raw_ip.c    |  45 +++++++++++++-----------------------------
 2 files changed, 28 insertions(+), 68 deletions(-)

diffs (252 lines):

diff -r 14cf3863434c -r 3c661d208ca0 sys/netinet/ip_output.c
--- a/sys/netinet/ip_output.c   Thu Feb 03 23:08:43 2005 +0000
+++ b/sys/netinet/ip_output.c   Thu Feb 03 23:13:20 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ip_output.c,v 1.139 2005/02/02 21:41:55 perry Exp $    */
+/*     $NetBSD: ip_output.c,v 1.140 2005/02/03 23:13:20 perry Exp $    */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -98,7 +98,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip_output.c,v 1.139 2005/02/02 21:41:55 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_output.c,v 1.140 2005/02/03 23:13:20 perry Exp $");
 
 #include "opt_pfil_hooks.h"
 #include "opt_inet.h"
@@ -1018,8 +1018,7 @@
  */
 
 u_int
-ip_optlen(inp)
-       struct inpcb *inp;
+ip_optlen(struct inpcb *inp)
 {
        struct mbuf *m = inp->inp_options;
 
@@ -1036,10 +1035,7 @@
  * as indicated by a non-zero in_addr at the start of the options.
  */
 static struct mbuf *
-ip_insertoptions(m, opt, phlen)
-       struct mbuf *m;
-       struct mbuf *opt;
-       int *phlen;
+ip_insertoptions(struct mbuf *m, struct mbuf *opt, int *phlen)
 {
        struct ipoption *p = mtod(opt, struct ipoption *);
        struct mbuf *n;
@@ -1084,8 +1080,7 @@
  * omitting those not copied during fragmentation.
  */
 int
-ip_optcopy(ip, jp)
-       struct ip *ip, *jp;
+ip_optcopy(struct ip *ip, struct ip *jp)
 {
        u_char *cp, *dp;
        int opt, optlen, cnt;
@@ -1129,11 +1124,8 @@
  * IP socket option processing.
  */
 int
-ip_ctloutput(op, so, level, optname, mp)
-       int op;
-       struct socket *so;
-       int level, optname;
-       struct mbuf **mp;
+ip_ctloutput(int op, struct socket *so, int level, int optname,
+    struct mbuf **mp)
 {
        struct inpcb *inp = sotoinpcb(so);
        struct mbuf *m = *mp;
@@ -1382,13 +1374,10 @@
  */
 int
 #ifdef notyet
-ip_pcbopts(optname, pcbopt, m)
-       int optname;
+ip_pcbopts(int optname, struct mbuf **pcbopt, struct mbuf *m)
 #else
-ip_pcbopts(pcbopt, m)
+ip_pcbopts(struct mbuf **pcbopt, struct mbuf *m)
 #endif
-       struct mbuf **pcbopt;
-       struct mbuf *m;
 {
        int cnt, optlen;
        u_char *cp;
@@ -1487,9 +1476,7 @@
  * following RFC1724 section 3.3, 0.0.0.0/8 is interpreted as interface index.
  */
 static struct ifnet *
-ip_multicast_if(a, ifindexp)
-       struct in_addr *a;
-       int *ifindexp;
+ip_multicast_if(struct in_addr *a, int *ifindexp)
 {
        int ifindex;
        struct ifnet *ifp = NULL;
@@ -1522,10 +1509,7 @@
  * Set the IP multicast options in response to user setsockopt().
  */
 int
-ip_setmoptions(optname, imop, m)
-       int optname;
-       struct ip_moptions **imop;
-       struct mbuf *m;
+ip_setmoptions(int optname, struct ip_moptions **imop, struct mbuf *m)
 {
        int error = 0;
        u_char loop;
@@ -1767,10 +1751,7 @@
  * Return the IP multicast options in response to user getsockopt().
  */
 int
-ip_getmoptions(optname, imo, mp)
-       int optname;
-       struct ip_moptions *imo;
-       struct mbuf **mp;
+ip_getmoptions(int optname, struct ip_moptions *imo, struct mbuf **mp)
 {
        u_char *ttl;
        u_char *loop;
@@ -1818,8 +1799,7 @@
  * Discard the IP multicast options.
  */
 void
-ip_freemoptions(imo)
-       struct ip_moptions *imo;
+ip_freemoptions(struct ip_moptions *imo)
 {
        int i;
 
@@ -1837,10 +1817,7 @@
  * pointer that might NOT be lo0ifp -- easier than replicating that code here.
  */
 static void
-ip_mloopback(ifp, m, dst)
-       struct ifnet *ifp;
-       struct mbuf *m;
-       struct sockaddr_in *dst;
+ip_mloopback(struct ifnet *ifp, struct mbuf *m, struct sockaddr_in *dst)
 {
        struct ip *ip;
        struct mbuf *copym;
diff -r 14cf3863434c -r 3c661d208ca0 sys/netinet/raw_ip.c
--- a/sys/netinet/raw_ip.c      Thu Feb 03 23:08:43 2005 +0000
+++ b/sys/netinet/raw_ip.c      Thu Feb 03 23:13:20 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: raw_ip.c,v 1.82 2005/02/02 21:41:55 perry Exp $        */
+/*     $NetBSD: raw_ip.c,v 1.83 2005/02/03 23:16:40 perry Exp $        */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -61,7 +61,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: raw_ip.c,v 1.82 2005/02/02 21:41:55 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: raw_ip.c,v 1.83 2005/02/03 23:16:40 perry Exp $");
 
 #include "opt_inet.h"
 #include "opt_ipsec.h"
@@ -122,7 +122,7 @@
  * Initialize raw connection block q.
  */
 void
-rip_init()
+rip_init(void)
 {
 
        in_pcbinit(&rawcbtable, 1, 1);
@@ -236,12 +236,9 @@
 }
 
 int
-rip_pcbnotify(table, faddr, laddr, proto, errno, notify)
-       struct inpcbtable *table;
-       struct in_addr faddr, laddr;
-       int proto;
-       int errno;
-       void (*notify)(struct inpcb *, int);
+rip_pcbnotify(struct inpcbtable *table,
+    struct in_addr faddr, struct in_addr laddr, int proto, int errno,
+    void (*notify)(struct inpcb *, int))
 {
        struct inpcb *inp, *ninp;
        int nmatch;
@@ -266,10 +263,7 @@
 }
 
 void *
-rip_ctlinput(cmd, sa, v)
-       int cmd;
-       struct sockaddr *sa;
-       void *v;
+rip_ctlinput(int cmd, struct sockaddr *sa, void *v)
 {
        struct ip *ip = v;
        void (*notify)(struct inpcb *, int) = in_rtchange;
@@ -383,11 +377,8 @@
  * Raw IP socket option processing.
  */
 int
-rip_ctloutput(op, so, level, optname, m)
-       int op;
-       struct socket *so;
-       int level, optname;
-       struct mbuf **m;
+rip_ctloutput(int op, struct socket *so, int level, int optname,
+    struct mbuf **m)
 {
        struct inpcb *inp = sotoinpcb(so);
        int error = 0;
@@ -462,9 +453,7 @@
 }
 
 int
-rip_bind(inp, nam)
-       struct inpcb *inp;
-       struct mbuf *nam;
+rip_bind(struct inpcb *inp, struct mbuf *nam)
 {
        struct sockaddr_in *addr = mtod(nam, struct sockaddr_in *);
 
@@ -483,9 +472,7 @@
 }
 
 int
-rip_connect(inp, nam)
-       struct inpcb *inp;
-       struct mbuf *nam;
+rip_connect(struct inpcb *inp, struct mbuf *nam)
 {
        struct sockaddr_in *addr = mtod(nam, struct sockaddr_in *);
 
@@ -501,8 +488,7 @@
 }
 
 void
-rip_disconnect(inp)
-       struct inpcb *inp;
+rip_disconnect(struct inpcb *inp)
 {
 
        inp->inp_faddr = zeroin_addr;
@@ -513,11 +499,8 @@
 
 /*ARGSUSED*/
 int
-rip_usrreq(so, req, m, nam, control, p)
-       struct socket *so;
-       int req;
-       struct mbuf *m, *nam, *control;
-       struct proc *p;
+rip_usrreq(struct socket *so, int req,
+    struct mbuf *m, struct mbuf *nam, struct mbuf *control, struct proc *p)
 {
        struct inpcb *inp;
        int s;