Stop using old-style function definitions.

This commit is contained in:
Ralf Corsepius
2008-09-01 03:35:37 +00:00
parent b8730831a2
commit fbf3f981e9
4 changed files with 57 additions and 144 deletions

View File

@@ -80,8 +80,7 @@ extern struct linker_set domain_set;
/* ARGSUSED*/ /* ARGSUSED*/
void void
domaininit(dummy) domaininit(void *dummy)
void *dummy;
{ {
register struct domain *dp; register struct domain *dp;
register struct protosw *pr; register struct protosw *pr;
@@ -125,8 +124,7 @@ domaininit(dummy)
* to this does not also take place at splimp by default. * to this does not also take place at splimp by default.
*/ */
static void static void
kludge_splimp(udata) kludge_splimp(void *udata)
void *udata;
{ {
int *savesplp = udata; int *savesplp = udata;
@@ -134,8 +132,7 @@ kludge_splimp(udata)
} }
static void static void
kludge_splx(udata) kludge_splx(void *udata)
void *udata;
{ {
int *savesplp = udata; int *savesplp = udata;
@@ -186,9 +183,7 @@ found:
} }
void void
pfctlinput(cmd, sa) pfctlinput(int cmd, struct sockaddr *sa)
int cmd;
struct sockaddr *sa;
{ {
register struct domain *dp; register struct domain *dp;
register struct protosw *pr; register struct protosw *pr;
@@ -200,8 +195,7 @@ pfctlinput(cmd, sa)
} }
static void static void
pfslowtimo(arg) pfslowtimo(void *arg)
void *arg;
{ {
register struct domain *dp; register struct domain *dp;
register struct protosw *pr; register struct protosw *pr;
@@ -214,8 +208,7 @@ pfslowtimo(arg)
} }
static void static void
pffasttimo(arg) pffasttimo(void *arg)
void *arg;
{ {
register struct domain *dp; register struct domain *dp;
register struct protosw *pr; register struct protosw *pr;

View File

@@ -47,7 +47,7 @@
#include <vm/vm_extern.h> #include <vm/vm_extern.h>
#if !defined(__rtems__) #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) SYSINIT(mbuf, SI_SUB_MBUF, SI_ORDER_FIRST, mbinit, NULL)
#endif #endif
@@ -71,8 +71,7 @@ int max_datalen;
* then re-attempt to allocate an mbuf. * then re-attempt to allocate an mbuf.
*/ */
struct mbuf * struct mbuf *
m_retry(i, t) m_retry(int i, int t)
int i, t;
{ {
register struct mbuf *m; register struct mbuf *m;
@@ -91,8 +90,7 @@ m_retry(i, t)
* As above; retry an MGETHDR. * As above; retry an MGETHDR.
*/ */
struct mbuf * struct mbuf *
m_retryhdr(i, t) m_retryhdr(int i, int t)
int i, t;
{ {
register struct mbuf *m; register struct mbuf *m;
@@ -128,8 +126,7 @@ m_reclaim(void)
* for critical paths. * for critical paths.
*/ */
struct mbuf * struct mbuf *
m_get(nowait, type) m_get(int nowait, int type)
int nowait, type;
{ {
register struct mbuf *m; register struct mbuf *m;
@@ -138,8 +135,7 @@ m_get(nowait, type)
} }
struct mbuf * struct mbuf *
m_gethdr(nowait, type) m_gethdr(int nowait, int type)
int nowait, type;
{ {
register struct mbuf *m; register struct mbuf *m;
@@ -148,8 +144,7 @@ m_gethdr(nowait, type)
} }
struct mbuf * struct mbuf *
m_getclr(nowait, type) m_getclr(int nowait, int type)
int nowait, type;
{ {
register struct mbuf *m; register struct mbuf *m;
@@ -693,11 +688,7 @@ m_devget(char *buf, int totlen, int off0, struct ifnet *ifp,
* chain if necessary. * chain if necessary.
*/ */
int int
m_copyback(m0, off, len, cp) m_copyback(struct mbuf *m0, int off, int len, caddr_t cp)
struct mbuf *m0;
register int off;
register int len;
caddr_t cp;
{ {
int mlen; int mlen;
struct mbuf *m = m0, *n; struct mbuf *m = m0, *n;

View File

@@ -59,12 +59,8 @@ SYSCTL_INT(_kern, KIPC_SOMAXCONN, somaxconn, CTLFLAG_RW, &somaxconn, 0, "");
*/ */
/*ARGSUSED*/ /*ARGSUSED*/
int int
socreate(dom, aso, type, proto, p) socreate(int dom, struct socket **aso, int type, int proto,
int dom; struct proc *p)
struct socket **aso;
register int type;
int proto;
struct proc *p;
{ {
register struct protosw *prp; register struct protosw *prp;
register struct socket *so; register struct socket *so;
@@ -97,9 +93,7 @@ socreate(dom, aso, type, proto, p)
} }
int int
sobind(so, nam) sobind(struct socket *so, struct mbuf *nam)
struct socket *so;
struct mbuf *nam;
{ {
int s = splnet(); int s = splnet();
int error; int error;
@@ -110,9 +104,7 @@ sobind(so, nam)
} }
int int
solisten(so, backlog) solisten(struct socket *so, int backlog)
register struct socket *so;
int backlog;
{ {
int s = splnet(), error; int s = splnet(), error;
@@ -131,8 +123,7 @@ solisten(so, backlog)
} }
void void
sofree(so) sofree(struct socket *so)
register struct socket *so;
{ {
struct socket *head = so->so_head; struct socket *head = so->so_head;
@@ -162,8 +153,7 @@ sofree(so)
* Free socket when disconnect complete. * Free socket when disconnect complete.
*/ */
int int
soclose(so) soclose(struct socket *so)
register struct socket *so;
{ {
int s = splnet(); /* conservative */ int s = splnet(); /* conservative */
int error = 0; int error = 0;
@@ -216,17 +206,14 @@ discard:
* Must be called at splnet... * Must be called at splnet...
*/ */
int int
soabort(so) soabort(struct socket *so)
struct socket *so;
{ {
return (*so->so_proto->pr_usrreqs->pru_abort)(so); return (*so->so_proto->pr_usrreqs->pru_abort)(so);
} }
int int
soaccept(so, nam) soaccept(struct socket *so, struct mbuf *nam)
register struct socket *so;
struct mbuf *nam;
{ {
int s = splnet(); int s = splnet();
int error; int error;
@@ -240,9 +227,7 @@ soaccept(so, nam)
} }
int int
soconnect(so, nam) soconnect(struct socket *so, struct mbuf *nam)
register struct socket *so;
struct mbuf *nam;
{ {
int s; int s;
int error; int error;
@@ -267,9 +252,7 @@ soconnect(so, nam)
} }
int int
soconnect2(so1, so2) soconnect2(struct socket *so1,struct socket *so2)
register struct socket *so1;
struct socket *so2;
{ {
int s = splnet(); int s = splnet();
int error; int error;
@@ -280,8 +263,7 @@ soconnect2(so1, so2)
} }
int int
sodisconnect(so) sodisconnect(struct socket *so)
register struct socket *so;
{ {
int s = splnet(); int s = splnet();
int error; int error;
@@ -319,13 +301,8 @@ bad:
* Data and control buffers are freed on return. * Data and control buffers are freed on return.
*/ */
int int
sosend(so, addr, uio, top, control, flags) sosend(struct socket *so, struct mbuf *addr, struct uio *uio,
register struct socket *so; struct mbuf *top, struct mbuf *control, int flags)
struct mbuf *addr;
struct uio *uio;
struct mbuf *top;
struct mbuf *control;
int flags;
{ {
struct mbuf **mp; struct mbuf **mp;
register struct mbuf *m; register struct mbuf *m;
@@ -512,13 +489,8 @@ out:
* only for the count in uio_resid. * only for the count in uio_resid.
*/ */
int int
soreceive(so, paddr, uio, mp0, controlp, flagsp) soreceive(struct socket *so, struct mbuf **paddr, struct uio *uio,
register struct socket *so; struct mbuf **mp0, struct mbuf **controlp, int *flagsp)
struct mbuf **paddr;
struct uio *uio;
struct mbuf **mp0;
struct mbuf **controlp;
int *flagsp;
{ {
register struct mbuf *m, **mp; register struct mbuf *m, **mp;
register int flags, len, error, s, offset; register int flags, len, error, s, offset;
@@ -809,9 +781,7 @@ release:
} }
int int
soshutdown(so, how) soshutdown(struct socket *so, int how )
register struct socket *so;
register int how;
{ {
register struct protosw *pr = so->so_proto; register struct protosw *pr = so->so_proto;
@@ -824,8 +794,7 @@ soshutdown(so, how)
} }
void void
sorflush(so) sorflush(struct socket *so)
register struct socket *so;
{ {
register struct sockbuf *sb = &so->so_rcv; register struct sockbuf *sb = &so->so_rcv;
register struct protosw *pr = so->so_proto; register struct protosw *pr = so->so_proto;
@@ -846,10 +815,7 @@ sorflush(so)
} }
int int
sosetopt(so, level, optname, m0) sosetopt(struct socket *so, int level, int optname, struct mbuf *m0)
register struct socket *so;
int level, optname;
struct mbuf *m0;
{ {
int error = 0; int error = 0;
register struct mbuf *m = m0; register struct mbuf *m = m0;
@@ -1020,10 +986,7 @@ bad:
} }
int int
sogetopt(so, level, optname, mp) sogetopt(struct socket *so, int level, int optname, struct mbuf **mp)
register struct socket *so;
int level, optname;
struct mbuf **mp;
{ {
register struct mbuf *m; register struct mbuf *m;
@@ -1127,8 +1090,7 @@ sogetopt(so, level, optname, mp)
} }
void void
sohasoutofband(so) sohasoutofband(struct socket *so)
register struct socket *so;
{ {
#if 0 /* FIXME: For now we just ignore out of band data */ #if 0 /* FIXME: For now we just ignore out of band data */
struct proc *p; struct proc *p;

View File

@@ -105,8 +105,7 @@ SYSCTL_INT(_kern, OID_AUTO, sockbuf_waste_factor, CTLFLAG_RW, &sb_efficiency,
*/ */
void void
soisconnecting(so) soisconnecting(struct socket *so)
register struct socket *so;
{ {
so->so_state &= ~(SS_ISCONNECTED|SS_ISDISCONNECTING); so->so_state &= ~(SS_ISCONNECTED|SS_ISDISCONNECTING);
@@ -114,8 +113,7 @@ soisconnecting(so)
} }
void void
soisconnected(so) soisconnected(struct socket *so)
register struct socket *so;
{ {
register struct socket *head = so->so_head; register struct socket *head = so->so_head;
@@ -137,8 +135,7 @@ soisconnected(so)
} }
void void
soisdisconnecting(so) soisdisconnecting(struct socket *so)
register struct socket *so;
{ {
so->so_state &= ~SS_ISCONNECTING; so->so_state &= ~SS_ISCONNECTING;
@@ -149,8 +146,7 @@ soisdisconnecting(so)
} }
void void
soisdisconnected(so) soisdisconnected(struct socket *so)
register struct socket *so;
{ {
so->so_state &= ~(SS_ISCONNECTING|SS_ISCONNECTED|SS_ISDISCONNECTING); so->so_state &= ~(SS_ISCONNECTING|SS_ISCONNECTED|SS_ISDISCONNECTING);
@@ -171,8 +167,7 @@ soisdisconnected(so)
* congestion routines. * congestion routines.
*/ */
struct socket * struct socket *
sodropablereq(head) sodropablereq(struct socket *head)
register struct socket *head;
{ {
register struct socket *so; register struct socket *so;
uint32_t i, j, qlen, m; uint32_t i, j, qlen, m;
@@ -215,9 +210,7 @@ sodropablereq(head)
* to catch calls that are missing the (new) second parameter. * to catch calls that are missing the (new) second parameter.
*/ */
struct socket * struct socket *
sonewconn1(head, connstatus) sonewconn1(struct socket *head, int connstatus)
register struct socket *head;
int connstatus;
{ {
register struct socket *so; register struct socket *so;
@@ -276,8 +269,7 @@ sonewconn1(head, connstatus)
*/ */
void void
socantsendmore(so) socantsendmore(struct socket *so)
struct socket *so;
{ {
so->so_state |= SS_CANTSENDMORE; so->so_state |= SS_CANTSENDMORE;
@@ -285,8 +277,7 @@ socantsendmore(so)
} }
void void
socantrcvmore(so) socantrcvmore(struct socket *so)
struct socket *so;
{ {
so->so_state |= SS_CANTRCVMORE; so->so_state |= SS_CANTRCVMORE;
@@ -326,9 +317,7 @@ socantrcvmore(so)
*/ */
int int
soreserve(so, sndcc, rcvcc) soreserve(struct socket *so, u_long sndcc, u_long rcvcc)
register struct socket *so;
u_long sndcc, rcvcc;
{ {
if (sbreserve(&so->so_snd, sndcc) == 0) if (sbreserve(&so->so_snd, sndcc) == 0)
@@ -354,9 +343,7 @@ bad:
* if buffering efficiency is near the normal case. * if buffering efficiency is near the normal case.
*/ */
int int
sbreserve(sb, cc) sbreserve(struct sockbuf *sb, u_long cc)
struct sockbuf *sb;
u_long cc;
{ {
if (cc > sb_max * MCLBYTES / (MSIZE + MCLBYTES)) if (cc > sb_max * MCLBYTES / (MSIZE + MCLBYTES))
@@ -372,8 +359,7 @@ sbreserve(sb, cc)
* Free mbufs held by a socket, and reserved mbuf space. * Free mbufs held by a socket, and reserved mbuf space.
*/ */
void void
sbrelease(sb) sbrelease(struct sockbuf *sb)
struct sockbuf *sb;
{ {
sbflush(sb); sbflush(sb);
@@ -412,9 +398,7 @@ sbrelease(sb)
* discarded and mbufs are compacted where possible. * discarded and mbufs are compacted where possible.
*/ */
void void
sbappend(sb, m) sbappend(struct sockbuf *sb, struct mbuf *m)
struct sockbuf *sb;
struct mbuf *m;
{ {
register struct mbuf *n; register struct mbuf *n;
@@ -436,8 +420,7 @@ sbappend(sb, m)
#ifdef SOCKBUF_DEBUG #ifdef SOCKBUF_DEBUG
void void
sbcheck(sb) sbcheck(struct sockbuf *sb)
register struct sockbuf *sb;
{ {
register struct mbuf *m; register struct mbuf *m;
register int len = 0, mbcnt = 0; register int len = 0, mbcnt = 0;
@@ -463,9 +446,7 @@ sbcheck(sb)
* begins a new record. * begins a new record.
*/ */
void void
sbappendrecord(sb, m0) sbappendrecord(struct sockbuf *sb, struct mbuf *m0)
register struct sockbuf *sb;
register struct mbuf *m0;
{ {
register struct mbuf *m; register struct mbuf *m;
@@ -499,9 +480,7 @@ sbappendrecord(sb, m0)
* but after any other OOB data. * but after any other OOB data.
*/ */
void void
sbinsertoob(sb, m0) sbinsertoob(struct sockbuf *sb, struct mbuf *m0)
register struct sockbuf *sb;
register struct mbuf *m0;
{ {
register struct mbuf *m; register struct mbuf *m;
register struct mbuf **mp; register struct mbuf **mp;
@@ -546,10 +525,8 @@ sbinsertoob(sb, m0)
* Returns 0 if no space in sockbuf or insufficient mbufs. * Returns 0 if no space in sockbuf or insufficient mbufs.
*/ */
int int
sbappendaddr(sb, asa, m0, control) sbappendaddr(struct sockbuf *sb, struct sockaddr *asa,
register struct sockbuf *sb; struct mbuf *m0, struct mbuf *control)
struct sockaddr *asa;
struct mbuf *m0, *control;
{ {
register struct mbuf *m, *n; register struct mbuf *m, *n;
int space = asa->sa_len; int space = asa->sa_len;
@@ -590,9 +567,8 @@ panic("sbappendaddr");
} }
int int
sbappendcontrol(sb, m0, control) sbappendcontrol(struct sockbuf *sb, struct mbuf *m0,
struct sockbuf *sb; struct mbuf *control)
struct mbuf *control, *m0;
{ {
register struct mbuf *m, *n; register struct mbuf *m, *n;
int space = 0; int space = 0;
@@ -628,9 +604,7 @@ sbappendcontrol(sb, m0, control)
* is null, the buffer is presumed empty. * is null, the buffer is presumed empty.
*/ */
void void
sbcompress(sb, m, n) sbcompress(struct sockbuf *sb, struct mbuf *m, struct mbuf *n)
register struct sockbuf *sb;
register struct mbuf *m, *n;
{ {
register int eor = 0; register int eor = 0;
register struct mbuf *o; register struct mbuf *o;
@@ -677,8 +651,7 @@ sbcompress(sb, m, n)
* Check that all resources are reclaimed. * Check that all resources are reclaimed.
*/ */
void void
sbflush(sb) sbflush(struct sockbuf *sb)
register struct sockbuf *sb;
{ {
if (sb->sb_flags & SB_LOCK) if (sb->sb_flags & SB_LOCK)
@@ -693,9 +666,7 @@ sbflush(sb)
* Drop data from (the front of) a sockbuf. * Drop data from (the front of) a sockbuf.
*/ */
void void
sbdrop(sb, len) sbdrop(struct sockbuf *sb, int len)
register struct sockbuf *sb;
register int len;
{ {
register struct mbuf *m, *mn; register struct mbuf *m, *mn;
struct mbuf *next; struct mbuf *next;
@@ -737,8 +708,7 @@ sbdrop(sb, len)
* and move the next record to the front. * and move the next record to the front.
*/ */
void void
sbdroprecord(sb) sbdroprecord(struct sockbuf *sb)
register struct sockbuf *sb;
{ {
register struct mbuf *m, *mn; register struct mbuf *m, *mn;
@@ -758,10 +728,7 @@ sbdroprecord(sb)
* with the specified type for presentation on a socket buffer. * with the specified type for presentation on a socket buffer.
*/ */
struct mbuf * struct mbuf *
sbcreatecontrol(p, size, type, level) sbcreatecontrol(caddr_t p, int size, int type, int level)
caddr_t p;
register int size;
int type, level;
{ {
register struct cmsghdr *cp; register struct cmsghdr *cp;
struct mbuf *m; struct mbuf *m;