Source-Changes-HG archive

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

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



details:   https://anonhg.NetBSD.org/src/rev/14cf3863434c
branches:  trunk
changeset: 573641:14cf3863434c
user:      perry <perry%NetBSD.org@localhost>
date:      Thu Feb 03 23:08:43 2005 +0000

description:
ANSIify function declarations

diffstat:

 sys/netinet/ip_mroute.c |  158 +++++++++++++----------------------------------
 1 files changed, 43 insertions(+), 115 deletions(-)

diffs (truncated from 447 to 300 lines):

diff -r a08fcb38b813 -r 14cf3863434c sys/netinet/ip_mroute.c
--- a/sys/netinet/ip_mroute.c   Thu Feb 03 22:51:50 2005 +0000
+++ b/sys/netinet/ip_mroute.c   Thu Feb 03 23:08:43 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ip_mroute.c,v 1.88 2005/02/02 21:41:55 perry Exp $     */
+/*     $NetBSD: ip_mroute.c,v 1.89 2005/02/03 23:08:43 perry Exp $     */
 
 /*
  * Copyright (c) 1992, 1993
@@ -93,7 +93,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip_mroute.c,v 1.88 2005/02/02 21:41:55 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_mroute.c,v 1.89 2005/02/03 23:08:43 perry Exp $");
 
 #include "opt_inet.h"
 #include "opt_ipsec.h"
@@ -460,10 +460,7 @@
  * Handle MRT setsockopt commands to modify the multicast routing tables.
  */
 int
-ip_mrouter_set(so, optname, m)
-       struct socket *so;
-       int optname;
-       struct mbuf **m;
+ip_mrouter_set(struct socket *so, int optname, struct mbuf **m)
 {
        int error;
 
@@ -515,10 +512,7 @@
  * Handle MRT getsockopt commands
  */
 int
-ip_mrouter_get(so, optname, m)
-       struct socket *so;
-       int optname;
-       struct mbuf **m;
+ip_mrouter_get(struct socket *so, int optname, struct mbuf **m)
 {
        int error;
 
@@ -557,10 +551,7 @@
  * Handle ioctl commands to obtain information from the cache
  */
 int
-mrt_ioctl(so, cmd, data)
-       struct socket *so;
-       u_long cmd;
-       caddr_t data;
+mrt_ioctl(struct socket *so, u_long cmd, caddr_t data)
 {
        int error;
 
@@ -586,8 +577,7 @@
  * returns the packet, byte, rpf-failure count for the source group provided
  */
 static int
-get_sg_cnt(req)
-       struct sioc_sg_req *req;
+get_sg_cnt(struct sioc_sg_req *req)
 {
        int s;
        struct mfc *rt;
@@ -611,8 +601,7 @@
  * returns the input and output packet and byte counts on the vif provided
  */
 static int
-get_vif_cnt(req)
-       struct sioc_vif_req *req;
+get_vif_cnt(struct sioc_vif_req *req)
 {
        vifi_t vifi = req->vifi;
 
@@ -631,9 +620,7 @@
  * Enable multicast routing
  */
 static int
-ip_mrouter_init(so, m)
-       struct socket *so;
-       struct mbuf *m;
+ip_mrouter_init(struct socket *so, struct mbuf *m)
 {
        int *v;
 
@@ -686,7 +673,7 @@
  * Disable multicast routing
  */
 int
-ip_mrouter_done()
+ip_mrouter_done(void)
 {
        vifi_t vifi;
        struct vif *vifp;
@@ -743,8 +730,7 @@
 }
 
 void
-ip_mrouter_detach(ifp)
-       struct ifnet *ifp;
+ip_mrouter_detach(struct ifnet *ifp)
 {
        int vifi, i;
        struct vif *vifp;
@@ -770,8 +756,7 @@
 }
 
 static int
-get_version(m)
-       struct mbuf *m;
+get_version(struct mbuf *m)
 {
        int *v = mtod(m, int *);
 
@@ -784,8 +769,7 @@
  * Set PIM assert processing global
  */
 static int
-set_assert(m)
-       struct mbuf *m;
+set_assert(struct mbuf *m)
 {
        int *i;
 
@@ -801,8 +785,7 @@
  * Get PIM assert processing global
  */
 static int
-get_assert(m)
-       struct mbuf *m;
+get_assert(struct mbuf *m)
 {
        int *i = mtod(m, int *);
 
@@ -895,8 +878,7 @@
  * Add a vif to the vif table
  */
 static int
-add_vif(m)
-       struct mbuf *m;
+add_vif(struct mbuf *m)
 {
        struct vifctl *vifcp;
        struct vif *vifp;
@@ -1035,8 +1017,7 @@
 }
 
 void
-reset_vif(vifp)
-       struct vif *vifp;
+reset_vif(struct vif *vifp)
 {
        struct mbuf *m, *n;
        struct ifnet *ifp;
@@ -1080,8 +1061,7 @@
  * Delete a vif from the vif table
  */
 static int
-del_vif(m)
-       struct mbuf *m;
+del_vif(struct mbuf *m)
 {
        vifi_t *vifip;
        struct vif *vifp;
@@ -1157,8 +1137,7 @@
 }
 
 static void
-expire_mfc(rt)
-       struct mfc *rt;
+expire_mfc(struct mfc *rt)
 {
        struct rtdetq *rte, *nrte;
 
@@ -1178,8 +1157,7 @@
  * Add an mfc entry
  */
 static int
-add_mfc(m)
-       struct mbuf *m;
+add_mfc(struct mbuf *m)
 {
        struct mfcctl2 mfcctl2;
        struct mfcctl2 *mfccp;
@@ -1325,8 +1303,7 @@
  * collect delay statistics on the upcalls
  */
 static void
-collate(t)
-       struct timeval *t;
+collate(struct timeval *t)
 {
        u_int32_t d;
        struct timeval tp;
@@ -1350,8 +1327,7 @@
  * Delete an mfc entry
  */
 static int
-del_mfc(m)
-       struct mbuf *m;
+del_mfc(struct mbuf *m)
 {
        struct mfcctl2 mfcctl2;
        struct mfcctl2 *mfccp;
@@ -1401,10 +1377,7 @@
 }
 
 static int
-socket_send(s, mm, src)
-       struct socket *s;
-       struct mbuf *mm;
-       struct sockaddr_in *src;
+socket_send(struct socket *s, struct mbuf *mm, struct sockaddr_in *src)
 {
        if (s) {
                if (sbappendaddr(&s->so_rcv, sintosa(src), mm,
@@ -1433,14 +1406,9 @@
 
 int
 #ifdef RSVP_ISI
-ip_mforward(m, ifp, imo)
+ip_mforward(struct mbuf *m, struct ifnet *ifp, struct ip_moptions *imo)
 #else
-ip_mforward(m, ifp)
-#endif /* RSVP_ISI */
-       struct mbuf *m;
-       struct ifnet *ifp;
-#ifdef RSVP_ISI
-       struct ip_moptions *imo;
+ip_mforward(struct mbuf *m, struct ifnet *ifp)
 #endif /* RSVP_ISI */
 {
        struct ip *ip = mtod(m, struct ip *);
@@ -1685,8 +1653,7 @@
 
 /*ARGSUSED*/
 static void
-expire_upcalls(v)
-       void *v;
+expire_upcalls(void *v)
 {
        int i;
        int s;
@@ -1737,15 +1704,9 @@
  */
 static int
 #ifdef RSVP_ISI
-ip_mdq(m, ifp, rt, xmt_vif)
+ip_mdq(struct mbuf *m, struct ifnet *ifp, struct mfc *rt, vifi_t xmt_vif)
 #else
-ip_mdq(m, ifp, rt)
-#endif /* RSVP_ISI */
-       struct mbuf *m;
-       struct ifnet *ifp;
-       struct mfc *rt;
-#ifdef RSVP_ISI
-       vifi_t xmt_vif;
+ip_mdq(struct mbuf *m, struct ifnet *ifp, struct mfc *rt)
 #endif /* RSVP_ISI */
 {
        struct ip  *ip = mtod(m, struct ip *);
@@ -1911,8 +1872,7 @@
  * check if a vif number is legal/ok. This is used by ip_output.
  */
 int
-legal_vif_num(vif)
-       int vif;
+legal_vif_num(int vif)
 {
        if (vif >= 0 && vif < numvifs)
                return (1);
@@ -1922,10 +1882,7 @@
 #endif /* RSVP_ISI */
 
 static void
-phyint_send(ip, vifp, m)
-       struct ip *ip;
-       struct vif *vifp;
-       struct mbuf *m;
+phyint_send(struct ip *ip, struct vif *vifp, struct mbuf *m)
 {
        struct mbuf *mb_copy;
        int hlen = ip->ip_hl << 2;
@@ -1948,10 +1905,7 @@
 }
 
 static void
-encap_send(ip, vifp, m)
-       struct ip *ip;
-       struct vif *vifp;
-       struct mbuf *m;
+encap_send(struct ip *ip, struct vif *vifp, struct mbuf *m)
 {
        struct mbuf *mb_copy;
        struct ip *ip_copy;
@@ -2060,11 +2014,7 @@
  * Check if the packet should be grabbed by us.
  */
 static int
-vif_encapcheck(m, off, proto, arg)



Home | Main Index | Thread Index | Old Index