From a66bc0f761fcc23e27977921cfe583d1c9ba3e82 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Mon, 1 Sep 2008 11:32:18 +0000 Subject: Stop using old-style function definitions. --- cpukit/librpc/src/rpc/auth_none.c | 2 +- cpukit/librpc/src/rpc/authunix_prot.c | 6 +++--- cpukit/librpc/src/rpc/bindresvport.c | 12 ++++++------ cpukit/librpc/src/rpc/clnt_generic.c | 10 +++++----- cpukit/librpc/src/rpc/clnt_udp.c | 28 ++++++++++++++-------------- cpukit/librpc/src/rpc/getrpcent.c | 13 +++++-------- cpukit/librpc/src/rpc/netname.c | 19 +++++++++---------- cpukit/librpc/src/rpc/netnamer.c | 31 ++++++++++++++++--------------- cpukit/librpc/src/rpc/pmap_clnt.c | 16 ++++++++-------- cpukit/librpc/src/rpc/pmap_getmaps.c | 3 +-- cpukit/librpc/src/rpc/pmap_getport.c | 10 +++++----- cpukit/librpc/src/rpc/pmap_prot.c | 6 +++--- cpukit/librpc/src/rpc/pmap_prot2.c | 6 +++--- cpukit/librpc/src/rpc/rpc_callmsg.c | 6 +++--- cpukit/librpc/src/rpc/svc_run.c | 2 +- 15 files changed, 83 insertions(+), 87 deletions(-) (limited to 'cpukit/librpc/src/rpc') diff --git a/cpukit/librpc/src/rpc/auth_none.c b/cpukit/librpc/src/rpc/auth_none.c index 61bf7d47fe..d88d150977 100644 --- a/cpukit/librpc/src/rpc/auth_none.c +++ b/cpukit/librpc/src/rpc/auth_none.c @@ -71,7 +71,7 @@ static struct authnone_private { } *authnone_private; AUTH * -authnone_create() +authnone_create(void) { struct authnone_private *ap = authnone_private; XDR xdr_stream; diff --git a/cpukit/librpc/src/rpc/authunix_prot.c b/cpukit/librpc/src/rpc/authunix_prot.c index 5791e9e1f9..fcabfc38bf 100644 --- a/cpukit/librpc/src/rpc/authunix_prot.c +++ b/cpukit/librpc/src/rpc/authunix_prot.c @@ -50,9 +50,9 @@ static char *rcsid = "$FreeBSD: src/lib/libc/rpc/authunix_prot.c,v 1.6 1999/08/2 * XDR for unix authentication parameters. */ bool_t -xdr_authunix_parms(xdrs, p) - register XDR *xdrs; - register struct authunix_parms *p; +xdr_authunix_parms( + XDR *xdrs, + struct authunix_parms *p) { if (xdr_u_long(xdrs, &(p->aup_time)) diff --git a/cpukit/librpc/src/rpc/bindresvport.c b/cpukit/librpc/src/rpc/bindresvport.c index e987d77f7b..8f949c8d90 100644 --- a/cpukit/librpc/src/rpc/bindresvport.c +++ b/cpukit/librpc/src/rpc/bindresvport.c @@ -57,9 +57,9 @@ static char *rcsid = "$FreeBSD: src/lib/libc/rpc/bindresvport.c,v 1.12 2000/01/2 * Bind a socket to a privileged IP port */ int -bindresvport(sd, sin) - int sd; - struct sockaddr_in *sin; +bindresvport( + int sd, + struct sockaddr_in *sin) { return bindresvport_sa(sd, (struct sockaddr *)sin); } @@ -68,9 +68,9 @@ bindresvport(sd, sin) * Bind a socket to a privileged IP port */ int -bindresvport_sa(sd, sa) - int sd; - struct sockaddr *sa; +bindresvport_sa( + int sd, + struct sockaddr *sa) { int old, error, af; struct sockaddr myaddr; diff --git a/cpukit/librpc/src/rpc/clnt_generic.c b/cpukit/librpc/src/rpc/clnt_generic.c index d387fae4c0..b27804228d 100644 --- a/cpukit/librpc/src/rpc/clnt_generic.c +++ b/cpukit/librpc/src/rpc/clnt_generic.c @@ -48,11 +48,11 @@ static char *rcsid = "$FreeBSD: src/lib/libc/rpc/clnt_generic.c,v 1.9 1999/08/28 * change using the rpc equivalent of ioctl()'s. */ CLIENT * -clnt_create(hostname, prog, vers, proto) - char *hostname; - u_long prog; - u_long vers; - char *proto; +clnt_create( + char *hostname, + u_long prog, + u_long vers, + char *proto) { struct hostent *h; struct protoent *p; diff --git a/cpukit/librpc/src/rpc/clnt_udp.c b/cpukit/librpc/src/rpc/clnt_udp.c index ca7225820e..03fc1b68a7 100644 --- a/cpukit/librpc/src/rpc/clnt_udp.c +++ b/cpukit/librpc/src/rpc/clnt_udp.c @@ -106,14 +106,14 @@ struct cu_data { * sent and received. */ CLIENT * -clntudp_bufcreate(raddr, program, version, wait, sockp, sendsz, recvsz) - struct sockaddr_in *raddr; - u_long program; - u_long version; - struct timeval wait; - register int *sockp; - u_int sendsz; - u_int recvsz; +clntudp_bufcreate( + struct sockaddr_in *raddr, + u_long program, + u_long version, + struct timeval wait, + int *sockp, + u_int sendsz, + u_int recvsz) { CLIENT *cl; register struct cu_data *cu = NULL; @@ -200,12 +200,12 @@ fooy: } CLIENT * -clntudp_create(raddr, program, version, wait, sockp) - struct sockaddr_in *raddr; - u_long program; - u_long version; - struct timeval wait; - register int *sockp; +clntudp_create( + struct sockaddr_in *raddr, + u_long program, + u_long version, + struct timeval wait, + int *sockp) { return(clntudp_bufcreate(raddr, program, version, wait, sockp, diff --git a/cpukit/librpc/src/rpc/getrpcent.c b/cpukit/librpc/src/rpc/getrpcent.c index 5eb9c98ad5..27ff4d3c14 100644 --- a/cpukit/librpc/src/rpc/getrpcent.c +++ b/cpukit/librpc/src/rpc/getrpcent.c @@ -86,8 +86,7 @@ _rpcdata(void) } struct rpcent * -getrpcbynumber(number) - register int number; +getrpcbynumber(int number) { register struct rpcdata *d = _rpcdata(); register struct rpcent *p; @@ -131,8 +130,7 @@ no_yp: } struct rpcent * -getrpcbyname(name) - char *name; +getrpcbyname(char *name) { struct rpcent *rpc = NULL; char **rp; @@ -152,8 +150,7 @@ done: } void -setrpcent(f) - int f; +setrpcent(int f) { register struct rpcdata *d = _rpcdata(); @@ -177,7 +174,7 @@ setrpcent(f) } void -endrpcent() +endrpcent(void) { register struct rpcdata *d = _rpcdata(); @@ -200,7 +197,7 @@ endrpcent() } struct rpcent * -getrpcent() +getrpcent(void) { register struct rpcdata *d = _rpcdata(); #ifdef YP diff --git a/cpukit/librpc/src/rpc/netname.c b/cpukit/librpc/src/rpc/netname.c index 22167bee86..4c9584a109 100644 --- a/cpukit/librpc/src/rpc/netname.c +++ b/cpukit/librpc/src/rpc/netname.c @@ -65,8 +65,7 @@ static char *OPSYS = "unix"; * Figure out my fully qualified network name */ int -getnetname(name) - char name[MAXNETNAMELEN+1]; +getnetname(char name[MAXNETNAMELEN+1]) { uid_t uid; @@ -83,10 +82,10 @@ getnetname(name) * Convert unix cred to network-name */ int -user2netname(netname, uid, domain) - char netname[MAXNETNAMELEN + 1]; - uid_t uid; - char *domain; +user2netname( + char netname[MAXNETNAMELEN + 1], + uid_t uid, + char *domain) { char *dfltdom; @@ -110,10 +109,10 @@ user2netname(netname, uid, domain) * Convert host to network-name */ int -host2netname(netname, host, domain) - char netname[MAXNETNAMELEN + 1]; - char *host; - char *domain; +host2netname( + char netname[MAXNETNAMELEN + 1], + char *host, + char *domain) { char *dfltdom; char hostname[MAXHOSTNAMELEN+1]; diff --git a/cpukit/librpc/src/rpc/netnamer.c b/cpukit/librpc/src/rpc/netnamer.c index 537464a383..82bc3c8ed7 100644 --- a/cpukit/librpc/src/rpc/netnamer.c +++ b/cpukit/librpc/src/rpc/netnamer.c @@ -68,12 +68,12 @@ static int _getgroups ( char *, gid_t * ); * Convert network-name into unix credential */ int -netname2user(netname, uidp, gidp, gidlenp, gidlist) - char netname[MAXNETNAMELEN + 1]; - uid_t *uidp; - gid_t *gidp; - int *gidlenp; - gid_t *gidlist; +netname2user( + char netname[MAXNETNAMELEN + 1], + uid_t *uidp, + gid_t *gidp, + int *gidlenp, + gid_t *gidlist) { char *p; int gidlen; @@ -148,9 +148,9 @@ netname2user(netname, uidp, gidp, gidlenp, gidlist) */ static int -_getgroups(uname, groups) - char *uname; - gid_t groups[NGROUPS]; +_getgroups( + char *uname, + gid_t groups[NGROUPS]) { gid_t ngroups = 0; register struct group *grp; @@ -189,10 +189,10 @@ toomany: * Convert network-name to hostname */ int -netname2host(netname, hostname, hostlen) - char netname[MAXNETNAMELEN + 1]; - char *hostname; - int hostlen; +netname2host( + char netname[MAXNETNAMELEN + 1], + char *hostname, + int hostlen) { int err; char valbuf[1024]; @@ -238,8 +238,9 @@ netname2host(netname, hostname, hostlen) * network information service. */ int -getnetid(key, ret) - char *key, *ret; +getnetid( + char *key, + char *ret) { char buf[1024]; /* big enough */ char *res; diff --git a/cpukit/librpc/src/rpc/pmap_clnt.c b/cpukit/librpc/src/rpc/pmap_clnt.c index 5801006939..5058e19699 100644 --- a/cpukit/librpc/src/rpc/pmap_clnt.c +++ b/cpukit/librpc/src/rpc/pmap_clnt.c @@ -60,11 +60,11 @@ static struct timeval tottimeout = { 60, 0 }; * Calls the pmap service remotely to do the mapping. */ bool_t -pmap_set(program, version, protocol, port) - u_long program; - u_long version; - int protocol; - int port; /* was u_short but changed to match prototype */ +pmap_set( + u_long program, + u_long version, + int protocol, + int port) /* was u_short but changed to match prototype */ { struct sockaddr_in myaddress; int socket = -1; @@ -109,9 +109,9 @@ pmap_set(program, version, protocol, port) * Calls the pmap service remotely to do the un-mapping. */ bool_t -pmap_unset(program, version) - u_long program; - u_long version; +pmap_unset( + u_long program, + u_long version) { struct sockaddr_in myaddress; int socket = -1; diff --git a/cpukit/librpc/src/rpc/pmap_getmaps.c b/cpukit/librpc/src/rpc/pmap_getmaps.c index 7585d683cd..f917178c15 100644 --- a/cpukit/librpc/src/rpc/pmap_getmaps.c +++ b/cpukit/librpc/src/rpc/pmap_getmaps.c @@ -60,8 +60,7 @@ static char *rcsid = "$FreeBSD: src/lib/libc/rpc/pmap_getmaps.c,v 1.11 2000/01/2 * Calls the pmap service remotely to do get the maps. */ struct pmaplist * -pmap_getmaps(address) - struct sockaddr_in *address; +pmap_getmaps(struct sockaddr_in *address) { struct pmaplist *head = (struct pmaplist *)NULL; int socket = -1; diff --git a/cpukit/librpc/src/rpc/pmap_getport.c b/cpukit/librpc/src/rpc/pmap_getport.c index 31fa7689b9..9692a0fd92 100644 --- a/cpukit/librpc/src/rpc/pmap_getport.c +++ b/cpukit/librpc/src/rpc/pmap_getport.c @@ -57,11 +57,11 @@ static struct timeval tottimeout = { 60, 0 }; * Returns 0 if no map exists. */ u_short -pmap_getport(address, program, version, protocol) - struct sockaddr_in *address; - u_long program; - u_long version; - u_int protocol; +pmap_getport( + struct sockaddr_in *address, + u_long program, + u_long version, + u_int protocol ) { u_short port = 0; int socket = -1; diff --git a/cpukit/librpc/src/rpc/pmap_prot.c b/cpukit/librpc/src/rpc/pmap_prot.c index ec7ab30812..805bfc79be 100644 --- a/cpukit/librpc/src/rpc/pmap_prot.c +++ b/cpukit/librpc/src/rpc/pmap_prot.c @@ -46,9 +46,9 @@ static char *rcsid = "$FreeBSD: src/lib/libc/rpc/pmap_prot.c,v 1.6 1999/08/28 00 bool_t -xdr_pmap(xdrs, regs) - XDR *xdrs; - struct pmap *regs; +xdr_pmap( + XDR *xdrs, + struct pmap *regs) { if (xdr_u_long(xdrs, ®s->pm_prog) && diff --git a/cpukit/librpc/src/rpc/pmap_prot2.c b/cpukit/librpc/src/rpc/pmap_prot2.c index 65ede28c37..c48942d84e 100644 --- a/cpukit/librpc/src/rpc/pmap_prot2.c +++ b/cpukit/librpc/src/rpc/pmap_prot2.c @@ -84,9 +84,9 @@ static char *rcsid = "$FreeBSD: src/lib/libc/rpc/pmap_prot2.c,v 1.7 1999/08/28 0 * this sounds like a job for xdr_reference! */ bool_t -xdr_pmaplist(xdrs, rp) - register XDR *xdrs; - register struct pmaplist **rp; +xdr_pmaplist( + XDR *xdrs, + struct pmaplist **rp) { /* * more_elements is pre-computed in case the direction is diff --git a/cpukit/librpc/src/rpc/rpc_callmsg.c b/cpukit/librpc/src/rpc/rpc_callmsg.c index 7cba797e85..7f8ef2ee66 100644 --- a/cpukit/librpc/src/rpc/rpc_callmsg.c +++ b/cpukit/librpc/src/rpc/rpc_callmsg.c @@ -49,9 +49,9 @@ static char *rcsid = "$FreeBSD: src/lib/libc/rpc/rpc_callmsg.c,v 1.9 1999/08/28 * XDR a call message */ bool_t -xdr_callmsg(xdrs, cmsg) - register XDR *xdrs; - register struct rpc_msg *cmsg; +xdr_callmsg( + XDR *xdrs, + struct rpc_msg *cmsg) { register int32_t *buf; register struct opaque_auth *oa; diff --git a/cpukit/librpc/src/rpc/svc_run.c b/cpukit/librpc/src/rpc/svc_run.c index b1b6dded2f..c5dda4ab16 100644 --- a/cpukit/librpc/src/rpc/svc_run.c +++ b/cpukit/librpc/src/rpc/svc_run.c @@ -48,7 +48,7 @@ static char *rcsid = "$FreeBSD: src/lib/libc/rpc/svc_run.c,v 1.10 1999/08/28 00: #include void -svc_run() +svc_run(void) { fd_set *fds; -- cgit v1.2.3