diff options
author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2008-09-01 03:35:37 +0000 |
---|---|---|
committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2008-09-01 03:35:37 +0000 |
commit | fbf3f981e98fded5fe390967d532b882d02913bd (patch) | |
tree | ed2f524331254da5645f20dd8a896b82b6705c91 | |
parent | 2008-08-31 Joel Sherrill <joel.sherrill@oarcorp.com> (diff) | |
download | rtems-fbf3f981e98fded5fe390967d532b882d02913bd.tar.bz2 |
Stop using old-style function definitions.
-rw-r--r-- | cpukit/libnetworking/kern/uipc_domain.c | 19 | ||||
-rw-r--r-- | cpukit/libnetworking/kern/uipc_mbuf.c | 23 | ||||
-rw-r--r-- | cpukit/libnetworking/kern/uipc_socket.c | 78 | ||||
-rw-r--r-- | cpukit/libnetworking/kern/uipc_socket2.c | 81 |
4 files changed, 57 insertions, 144 deletions
diff --git a/cpukit/libnetworking/kern/uipc_domain.c b/cpukit/libnetworking/kern/uipc_domain.c index 5ed7bdef82..8ba1925dd8 100644 --- a/cpukit/libnetworking/kern/uipc_domain.c +++ b/cpukit/libnetworking/kern/uipc_domain.c @@ -80,8 +80,7 @@ extern struct linker_set domain_set; /* ARGSUSED*/ void -domaininit(dummy) - void *dummy; +domaininit(void *dummy) { register struct domain *dp; register struct protosw *pr; @@ -125,8 +124,7 @@ domaininit(dummy) * to this does not also take place at splimp by default. */ static void -kludge_splimp(udata) - void *udata; +kludge_splimp(void *udata) { int *savesplp = udata; @@ -134,8 +132,7 @@ kludge_splimp(udata) } static void -kludge_splx(udata) - void *udata; +kludge_splx(void *udata) { int *savesplp = udata; @@ -186,9 +183,7 @@ found: } void -pfctlinput(cmd, sa) - int cmd; - struct sockaddr *sa; +pfctlinput(int cmd, struct sockaddr *sa) { register struct domain *dp; register struct protosw *pr; @@ -200,8 +195,7 @@ pfctlinput(cmd, sa) } static void -pfslowtimo(arg) - void *arg; +pfslowtimo(void *arg) { register struct domain *dp; register struct protosw *pr; @@ -214,8 +208,7 @@ pfslowtimo(arg) } static void -pffasttimo(arg) - void *arg; +pffasttimo(void *arg) { register struct domain *dp; register struct protosw *pr; diff --git a/cpukit/libnetworking/kern/uipc_mbuf.c b/cpukit/libnetworking/kern/uipc_mbuf.c index 7461aa7618..390f9b6899 100644 --- a/cpukit/libnetworking/kern/uipc_mbuf.c +++ b/cpukit/libnetworking/kern/uipc_mbuf.c @@ -47,7 +47,7 @@ #include <vm/vm_extern.h> #if !defined(__rtems__) -static void mbinit __P((void *)) __attribute__ ((unused)); +static void mbinit (void *) __attribute__ ((unused)); SYSINIT(mbuf, SI_SUB_MBUF, SI_ORDER_FIRST, mbinit, NULL) #endif @@ -71,8 +71,7 @@ int max_datalen; * then re-attempt to allocate an mbuf. */ struct mbuf * -m_retry(i, t) - int i, t; +m_retry(int i, int t) { register struct mbuf *m; @@ -91,8 +90,7 @@ m_retry(i, t) * As above; retry an MGETHDR. */ struct mbuf * -m_retryhdr(i, t) - int i, t; +m_retryhdr(int i, int t) { register struct mbuf *m; @@ -128,8 +126,7 @@ m_reclaim(void) * for critical paths. */ struct mbuf * -m_get(nowait, type) - int nowait, type; +m_get(int nowait, int type) { register struct mbuf *m; @@ -138,8 +135,7 @@ m_get(nowait, type) } struct mbuf * -m_gethdr(nowait, type) - int nowait, type; +m_gethdr(int nowait, int type) { register struct mbuf *m; @@ -148,8 +144,7 @@ m_gethdr(nowait, type) } struct mbuf * -m_getclr(nowait, type) - int nowait, type; +m_getclr(int nowait, int type) { register struct mbuf *m; @@ -693,11 +688,7 @@ m_devget(char *buf, int totlen, int off0, struct ifnet *ifp, * chain if necessary. */ int -m_copyback(m0, off, len, cp) - struct mbuf *m0; - register int off; - register int len; - caddr_t cp; +m_copyback(struct mbuf *m0, int off, int len, caddr_t cp) { int mlen; struct mbuf *m = m0, *n; diff --git a/cpukit/libnetworking/kern/uipc_socket.c b/cpukit/libnetworking/kern/uipc_socket.c index b0c47070e3..4b0874d4fc 100644 --- a/cpukit/libnetworking/kern/uipc_socket.c +++ b/cpukit/libnetworking/kern/uipc_socket.c @@ -59,12 +59,8 @@ SYSCTL_INT(_kern, KIPC_SOMAXCONN, somaxconn, CTLFLAG_RW, &somaxconn, 0, ""); */ /*ARGSUSED*/ int -socreate(dom, aso, type, proto, p) - int dom; - struct socket **aso; - register int type; - int proto; - struct proc *p; +socreate(int dom, struct socket **aso, int type, int proto, + struct proc *p) { register struct protosw *prp; register struct socket *so; @@ -97,9 +93,7 @@ socreate(dom, aso, type, proto, p) } int -sobind(so, nam) - struct socket *so; - struct mbuf *nam; +sobind(struct socket *so, struct mbuf *nam) { int s = splnet(); int error; @@ -110,9 +104,7 @@ sobind(so, nam) } int -solisten(so, backlog) - register struct socket *so; - int backlog; +solisten(struct socket *so, int backlog) { int s = splnet(), error; @@ -131,8 +123,7 @@ solisten(so, backlog) } void -sofree(so) - register struct socket *so; +sofree(struct socket *so) { struct socket *head = so->so_head; @@ -162,8 +153,7 @@ sofree(so) * Free socket when disconnect complete. */ int -soclose(so) - register struct socket *so; +soclose(struct socket *so) { int s = splnet(); /* conservative */ int error = 0; @@ -216,17 +206,14 @@ discard: * Must be called at splnet... */ int -soabort(so) - struct socket *so; +soabort(struct socket *so) { return (*so->so_proto->pr_usrreqs->pru_abort)(so); } int -soaccept(so, nam) - register struct socket *so; - struct mbuf *nam; +soaccept(struct socket *so, struct mbuf *nam) { int s = splnet(); int error; @@ -240,9 +227,7 @@ soaccept(so, nam) } int -soconnect(so, nam) - register struct socket *so; - struct mbuf *nam; +soconnect(struct socket *so, struct mbuf *nam) { int s; int error; @@ -267,9 +252,7 @@ soconnect(so, nam) } int -soconnect2(so1, so2) - register struct socket *so1; - struct socket *so2; +soconnect2(struct socket *so1,struct socket *so2) { int s = splnet(); int error; @@ -280,8 +263,7 @@ soconnect2(so1, so2) } int -sodisconnect(so) - register struct socket *so; +sodisconnect(struct socket *so) { int s = splnet(); int error; @@ -319,13 +301,8 @@ bad: * Data and control buffers are freed on return. */ int -sosend(so, addr, uio, top, control, flags) - register struct socket *so; - struct mbuf *addr; - struct uio *uio; - struct mbuf *top; - struct mbuf *control; - int flags; +sosend(struct socket *so, struct mbuf *addr, struct uio *uio, + struct mbuf *top, struct mbuf *control, int flags) { struct mbuf **mp; register struct mbuf *m; @@ -512,13 +489,8 @@ out: * only for the count in uio_resid. */ int -soreceive(so, paddr, uio, mp0, controlp, flagsp) - register struct socket *so; - struct mbuf **paddr; - struct uio *uio; - struct mbuf **mp0; - struct mbuf **controlp; - int *flagsp; +soreceive(struct socket *so, struct mbuf **paddr, struct uio *uio, + struct mbuf **mp0, struct mbuf **controlp, int *flagsp) { register struct mbuf *m, **mp; register int flags, len, error, s, offset; @@ -809,9 +781,7 @@ release: } int -soshutdown(so, how) - register struct socket *so; - register int how; +soshutdown(struct socket *so, int how ) { register struct protosw *pr = so->so_proto; @@ -824,8 +794,7 @@ soshutdown(so, how) } void -sorflush(so) - register struct socket *so; +sorflush(struct socket *so) { register struct sockbuf *sb = &so->so_rcv; register struct protosw *pr = so->so_proto; @@ -846,10 +815,7 @@ sorflush(so) } int -sosetopt(so, level, optname, m0) - register struct socket *so; - int level, optname; - struct mbuf *m0; +sosetopt(struct socket *so, int level, int optname, struct mbuf *m0) { int error = 0; register struct mbuf *m = m0; @@ -1020,10 +986,7 @@ bad: } int -sogetopt(so, level, optname, mp) - register struct socket *so; - int level, optname; - struct mbuf **mp; +sogetopt(struct socket *so, int level, int optname, struct mbuf **mp) { register struct mbuf *m; @@ -1127,8 +1090,7 @@ sogetopt(so, level, optname, mp) } void -sohasoutofband(so) - register struct socket *so; +sohasoutofband(struct socket *so) { #if 0 /* FIXME: For now we just ignore out of band data */ struct proc *p; diff --git a/cpukit/libnetworking/kern/uipc_socket2.c b/cpukit/libnetworking/kern/uipc_socket2.c index 74f7e1c9b0..319096722a 100644 --- a/cpukit/libnetworking/kern/uipc_socket2.c +++ b/cpukit/libnetworking/kern/uipc_socket2.c @@ -105,8 +105,7 @@ SYSCTL_INT(_kern, OID_AUTO, sockbuf_waste_factor, CTLFLAG_RW, &sb_efficiency, */ void -soisconnecting(so) - register struct socket *so; +soisconnecting(struct socket *so) { so->so_state &= ~(SS_ISCONNECTED|SS_ISDISCONNECTING); @@ -114,8 +113,7 @@ soisconnecting(so) } void -soisconnected(so) - register struct socket *so; +soisconnected(struct socket *so) { register struct socket *head = so->so_head; @@ -137,8 +135,7 @@ soisconnected(so) } void -soisdisconnecting(so) - register struct socket *so; +soisdisconnecting(struct socket *so) { so->so_state &= ~SS_ISCONNECTING; @@ -149,8 +146,7 @@ soisdisconnecting(so) } void -soisdisconnected(so) - register struct socket *so; +soisdisconnected(struct socket *so) { so->so_state &= ~(SS_ISCONNECTING|SS_ISCONNECTED|SS_ISDISCONNECTING); @@ -171,8 +167,7 @@ soisdisconnected(so) * congestion routines. */ struct socket * -sodropablereq(head) - register struct socket *head; +sodropablereq(struct socket *head) { register struct socket *so; uint32_t i, j, qlen, m; @@ -215,9 +210,7 @@ sodropablereq(head) * to catch calls that are missing the (new) second parameter. */ struct socket * -sonewconn1(head, connstatus) - register struct socket *head; - int connstatus; +sonewconn1(struct socket *head, int connstatus) { register struct socket *so; @@ -276,8 +269,7 @@ sonewconn1(head, connstatus) */ void -socantsendmore(so) - struct socket *so; +socantsendmore(struct socket *so) { so->so_state |= SS_CANTSENDMORE; @@ -285,8 +277,7 @@ socantsendmore(so) } void -socantrcvmore(so) - struct socket *so; +socantrcvmore(struct socket *so) { so->so_state |= SS_CANTRCVMORE; @@ -326,9 +317,7 @@ socantrcvmore(so) */ int -soreserve(so, sndcc, rcvcc) - register struct socket *so; - u_long sndcc, rcvcc; +soreserve(struct socket *so, u_long sndcc, u_long rcvcc) { if (sbreserve(&so->so_snd, sndcc) == 0) @@ -354,9 +343,7 @@ bad: * if buffering efficiency is near the normal case. */ int -sbreserve(sb, cc) - struct sockbuf *sb; - u_long cc; +sbreserve(struct sockbuf *sb, u_long cc) { if (cc > sb_max * MCLBYTES / (MSIZE + MCLBYTES)) @@ -372,8 +359,7 @@ sbreserve(sb, cc) * Free mbufs held by a socket, and reserved mbuf space. */ void -sbrelease(sb) - struct sockbuf *sb; +sbrelease(struct sockbuf *sb) { sbflush(sb); @@ -412,9 +398,7 @@ sbrelease(sb) * discarded and mbufs are compacted where possible. */ void -sbappend(sb, m) - struct sockbuf *sb; - struct mbuf *m; +sbappend(struct sockbuf *sb, struct mbuf *m) { register struct mbuf *n; @@ -436,8 +420,7 @@ sbappend(sb, m) #ifdef SOCKBUF_DEBUG void -sbcheck(sb) - register struct sockbuf *sb; +sbcheck(struct sockbuf *sb) { register struct mbuf *m; register int len = 0, mbcnt = 0; @@ -463,9 +446,7 @@ sbcheck(sb) * begins a new record. */ void -sbappendrecord(sb, m0) - register struct sockbuf *sb; - register struct mbuf *m0; +sbappendrecord(struct sockbuf *sb, struct mbuf *m0) { register struct mbuf *m; @@ -499,9 +480,7 @@ sbappendrecord(sb, m0) * but after any other OOB data. */ void -sbinsertoob(sb, m0) - register struct sockbuf *sb; - register struct mbuf *m0; +sbinsertoob(struct sockbuf *sb, struct mbuf *m0) { register struct mbuf *m; register struct mbuf **mp; @@ -546,10 +525,8 @@ sbinsertoob(sb, m0) * Returns 0 if no space in sockbuf or insufficient mbufs. */ int -sbappendaddr(sb, asa, m0, control) - register struct sockbuf *sb; - struct sockaddr *asa; - struct mbuf *m0, *control; +sbappendaddr(struct sockbuf *sb, struct sockaddr *asa, + struct mbuf *m0, struct mbuf *control) { register struct mbuf *m, *n; int space = asa->sa_len; @@ -590,9 +567,8 @@ panic("sbappendaddr"); } int -sbappendcontrol(sb, m0, control) - struct sockbuf *sb; - struct mbuf *control, *m0; +sbappendcontrol(struct sockbuf *sb, struct mbuf *m0, + struct mbuf *control) { register struct mbuf *m, *n; int space = 0; @@ -628,9 +604,7 @@ sbappendcontrol(sb, m0, control) * is null, the buffer is presumed empty. */ void -sbcompress(sb, m, n) - register struct sockbuf *sb; - register struct mbuf *m, *n; +sbcompress(struct sockbuf *sb, struct mbuf *m, struct mbuf *n) { register int eor = 0; register struct mbuf *o; @@ -677,8 +651,7 @@ sbcompress(sb, m, n) * Check that all resources are reclaimed. */ void -sbflush(sb) - register struct sockbuf *sb; +sbflush(struct sockbuf *sb) { if (sb->sb_flags & SB_LOCK) @@ -693,9 +666,7 @@ sbflush(sb) * Drop data from (the front of) a sockbuf. */ void -sbdrop(sb, len) - register struct sockbuf *sb; - register int len; +sbdrop(struct sockbuf *sb, int len) { register struct mbuf *m, *mn; struct mbuf *next; @@ -737,8 +708,7 @@ sbdrop(sb, len) * and move the next record to the front. */ void -sbdroprecord(sb) - register struct sockbuf *sb; +sbdroprecord(struct sockbuf *sb) { register struct mbuf *m, *mn; @@ -758,10 +728,7 @@ sbdroprecord(sb) * with the specified type for presentation on a socket buffer. */ struct mbuf * -sbcreatecontrol(p, size, type, level) - caddr_t p; - register int size; - int type, level; +sbcreatecontrol(caddr_t p, int size, int type, int level) { register struct cmsghdr *cp; struct mbuf *m; |