Stop using old-style function definitions.

19 files changed, 189 insertions, 195 deletions

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, &regs->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 <sys/select.h>
 
 void
-svc_run()
+svc_run(void)
 {
 	fd_set *fds;
 
diff --git a/cpukit/librpc/src/xdr/xdr.c b/cpukit/librpc/src/xdr/xdr.c
index 898c1f24ff..a27ac17552 100644
--- a/cpukit/librpc/src/xdr/xdr.c
+++ b/cpukit/librpc/src/xdr/xdr.c
@@ -71,9 +71,9 @@ static const char xdr_zero[BYTES_PER_XDR_UNIT] = { 0, 0, 0, 0 };
  * Not a filter, but a convenient utility nonetheless
  */
 void
-xdr_free(proc, objp)
-	xdrproc_t proc;
-	char *objp;
+xdr_free(
+	xdrproc_t proc,
+	char *objp)
 {
 	XDR x;
 
@@ -85,9 +85,7 @@ xdr_free(proc, objp)
  * XDR nothing
  */
 bool_t
-xdr_void(/* xdrs, addr */)
-	/* XDR *xdrs; */
-	/* caddr_t addr; */
+xdr_void(void)
 {
 
 	return (TRUE);
@@ -98,9 +96,9 @@ xdr_void(/* xdrs, addr */)
  * XDR integers
  */
 bool_t
-xdr_int(xdrs, ip)
-	XDR *xdrs;
-	int *ip;
+xdr_int(
+	XDR *xdrs,
+	int *ip)
 {
 	long l;
 
@@ -128,9 +126,9 @@ xdr_int(xdrs, ip)
  * XDR unsigned integers
  */
 bool_t
-xdr_u_int(xdrs, up)
-	XDR *xdrs;
-	u_int *up;
+xdr_u_int(
+	XDR *xdrs,
+	u_int *up)
 {
 	u_long l;
 
@@ -160,9 +158,9 @@ xdr_u_int(xdrs, up)
  * same as xdr_u_long - open coded to save a proc call!
  */
 bool_t
-xdr_long(xdrs, lp)
-	XDR *xdrs;
-	long *lp;
+xdr_long(
+	XDR *xdrs,
+	long *lp)
 {
 	switch (xdrs->x_op) {
 	case XDR_ENCODE:
@@ -181,9 +179,9 @@ xdr_long(xdrs, lp)
  * same as xdr_long - open coded to save a proc call!
  */
 bool_t
-xdr_u_long(xdrs, ulp)
-	XDR *xdrs;
-	u_long *ulp;
+xdr_u_long(
+	XDR *xdrs,
+	u_long *ulp)
 {
 	switch (xdrs->x_op) {
 	case XDR_ENCODE:
@@ -203,9 +201,9 @@ xdr_u_long(xdrs, ulp)
  * same as xdr_u_int32_t - open coded to save a proc call!
  */
 bool_t
-xdr_int32_t(xdrs, int32_p)
-	XDR *xdrs;
-	int32_t *int32_p;
+xdr_int32_t(
+	XDR *xdrs,
+	int32_t *int32_p)
 {
 	long l;
 
@@ -234,9 +232,9 @@ xdr_int32_t(xdrs, int32_p)
  * same as xdr_int32_t - open coded to save a proc call!
  */
 bool_t
-xdr_u_int32_t(xdrs, u_int32_p)
-	XDR *xdrs;
-	u_int32_t *u_int32_p;
+xdr_u_int32_t(
+	XDR *xdrs,
+	u_int32_t *u_int32_p)
 {
 	u_long l;
 
@@ -263,9 +261,9 @@ xdr_u_int32_t(xdrs, u_int32_p)
  * XDR short integers
  */
 bool_t
-xdr_short(xdrs, sp)
-	XDR *xdrs;
-	short *sp;
+xdr_short(
+	XDR *xdrs,
+	short *sp)
 {
 	long l;
 
@@ -293,9 +291,9 @@ xdr_short(xdrs, sp)
  * XDR unsigned short integers
  */
 bool_t
-xdr_u_short(xdrs, usp)
-	XDR *xdrs;
-	u_short *usp;
+xdr_u_short(
+	XDR *xdrs,
+	u_short *usp)
 {
 	u_long l;
 
@@ -324,9 +322,9 @@ xdr_u_short(xdrs, usp)
  * XDR 16-bit integers
  */
 bool_t
-xdr_int16_t(xdrs, int16_p)
-	XDR *xdrs;
-	int16_t *int16_p;
+xdr_int16_t(
+	XDR *xdrs,
+	int16_t *int16_p)
 {
 	long l;
 
@@ -354,9 +352,9 @@ xdr_int16_t(xdrs, int16_p)
  * XDR unsigned 16-bit integers
  */
 bool_t
-xdr_u_int16_t(xdrs, u_int16_p)
-	XDR *xdrs;
-	u_int16_t *u_int16_p;
+xdr_u_int16_t(
+	XDR *xdrs,
+	u_int16_t *u_int16_p)
 {
 	u_long l;
 
@@ -385,9 +383,9 @@ xdr_u_int16_t(xdrs, u_int16_p)
  * XDR a char
  */
 bool_t
-xdr_char(xdrs, cp)
-	XDR *xdrs;
-	char *cp;
+xdr_char(
+	XDR *xdrs,
+	char *cp)
 {
 	int i;
 
@@ -403,9 +401,9 @@ xdr_char(xdrs, cp)
  * XDR an unsigned char
  */
 bool_t
-xdr_u_char(xdrs, cp)
-	XDR *xdrs;
-	u_char *cp;
+xdr_u_char(
+	XDR *xdrs,
+	u_char *cp)
 {
 	u_int u;
 
@@ -421,9 +419,9 @@ xdr_u_char(xdrs, cp)
  * XDR booleans
  */
 bool_t
-xdr_bool(xdrs, bp)
-	XDR *xdrs;
-	bool_t *bp;
+xdr_bool(
+	XDR *xdrs,
+	bool_t *bp)
 {
 	long lb;
 
@@ -451,9 +449,9 @@ xdr_bool(xdrs, bp)
  * XDR enumerations
  */
 bool_t
-xdr_enum(xdrs, ep)
-	XDR *xdrs;
-	enum_t *ep;
+xdr_enum(
+	XDR *xdrs,
+	enum_t *ep)
 {
 #ifndef lint
 	enum sizecheck { SIZEVAL };	/* used to find the size of an enum */
@@ -483,10 +481,10 @@ xdr_enum(xdrs, ep)
  * cp points to the opaque object and cnt gives the byte length.
  */
 bool_t
-xdr_opaque(xdrs, cp, cnt)
-	XDR *xdrs;
-	caddr_t cp;
-	u_int cnt;
+xdr_opaque(
+	XDR *xdrs,
+	caddr_t cp,
+	u_int cnt)
 {
 	u_int rndup;
 	static int crud[BYTES_PER_XDR_UNIT];
@@ -535,11 +533,11 @@ xdr_opaque(xdrs, cp, cnt)
  * If *cpp is NULL maxsize bytes are allocated
  */
 bool_t
-xdr_bytes(xdrs, cpp, sizep, maxsize)
-	XDR *xdrs;
-	char **cpp;
-	u_int *sizep;
-	u_int maxsize;
+xdr_bytes(
+	XDR *xdrs,
+	char **cpp,
+	u_int *sizep,
+	u_int maxsize)
 {
 	char *sp = *cpp;  /* sp is the actual string pointer */
 	u_int nodesize;
@@ -591,9 +589,9 @@ xdr_bytes(xdrs, cpp, sizep, maxsize)
  * Implemented here due to commonality of the object.
  */
 bool_t
-xdr_netobj(xdrs, np)
-	XDR *xdrs;
-	struct netobj *np;
+xdr_netobj(
+	XDR *xdrs,
+	struct netobj *np)
 {
 
 	return (xdr_bytes(xdrs, &np->n_bytes, &np->n_len, MAX_NETOBJ_SZ));
@@ -611,12 +609,12 @@ xdr_netobj(xdrs, np)
  * If there is no specific or default routine an error is returned.
  */
 bool_t
-xdr_union(xdrs, dscmp, unp, choices, dfault)
-	XDR *xdrs;
-	enum_t *dscmp;		/* enum to decide which arm to work on */
-	char *unp;		/* the union itself */
-	const struct xdr_discrim *choices;	/* [value, xdr proc] for each arm */
-	xdrproc_t dfault;	/* default xdr routine */
+xdr_union(
+	XDR *xdrs,
+	enum_t *dscmp,		/* enum to decide which arm to work on */
+	char *unp,		/* the union itself */
+	const struct xdr_discrim *choices,	/* [value, xdr proc] for each arm */
+	xdrproc_t dfault)	/* default xdr routine */
 {
 	enum_t dscm;
 
@@ -660,10 +658,10 @@ xdr_union(xdrs, dscmp, unp, choices, dfault)
  * of the string as specified by a protocol.
  */
 bool_t
-xdr_string(xdrs, cpp, maxsize)
-	XDR *xdrs;
-	char **cpp;
-	u_int maxsize;
+xdr_string(
+	XDR *xdrs,
+	char **cpp,
+	u_int maxsize)
 {
 	char *sp = *cpp;  /* sp is the actual string pointer */
 	u_int size = 0;
@@ -727,9 +725,9 @@ xdr_string(xdrs, cpp, maxsize)
  * routines like clnt_call
  */
 bool_t
-xdr_wrapstring(xdrs, cpp)
-	XDR *xdrs;
-	char **cpp;
+xdr_wrapstring(
+	XDR *xdrs,
+	char **cpp)
 {
 	return xdr_string(xdrs, cpp, LASTUNSIGNED);
 }
@@ -738,9 +736,9 @@ xdr_wrapstring(xdrs, cpp)
  * XDR 64-bit integers
  */
 bool_t
-xdr_int64_t(xdrs, int64_p)
-	XDR *xdrs;
-	int64_t *int64_p;
+xdr_int64_t(
+	XDR *xdrs,
+	int64_t *int64_p)
 {
 	int64_t x;
 
@@ -765,9 +763,9 @@ xdr_int64_t(xdrs, int64_p)
  * XDR unsigned 64-bit integers
  */
 bool_t
-xdr_u_int64_t(xdrs, uint64_p)
-	XDR *xdrs;
-	u_int64_t *uint64_p;
+xdr_u_int64_t(
+	XDR *xdrs,
+	u_int64_t *uint64_p)
 {
 	u_int64_t x;
 
diff --git a/cpukit/librpc/src/xdr/xdr_array.c b/cpukit/librpc/src/xdr/xdr_array.c
index 53ced17096..1a514912c3 100644
--- a/cpukit/librpc/src/xdr/xdr_array.c
+++ b/cpukit/librpc/src/xdr/xdr_array.c
@@ -58,13 +58,13 @@ static char *rcsid = "$FreeBSD: src/lib/libc/xdr/xdr_array.c,v 1.8 1999/08/28 00
  * xdr procedure to call to handle each element of the array.
  */
 bool_t
-xdr_array(xdrs, addrp, sizep, maxsize, elsize, elproc)
-	register XDR *xdrs;
-	caddr_t *addrp;		/* array pointer */
-	u_int *sizep;		/* number of elements */
-	u_int maxsize;		/* max numberof elements */
-	u_int elsize;		/* size in bytes of each element */
-	xdrproc_t elproc;	/* xdr routine to handle each element */
+xdr_array(
+	register XDR *xdrs,
+	caddr_t *addrp,		/* array pointer */
+	u_int *sizep,		/* number of elements */
+	u_int maxsize,		/* max numberof elements */
+	u_int elsize,		/* size in bytes of each element */
+	xdrproc_t elproc)	/* xdr routine to handle each element */
 {
 	register u_int i;
 	register caddr_t target = *addrp;
@@ -135,12 +135,12 @@ xdr_array(xdrs, addrp, sizep, maxsize, elsize, elproc)
  * > xdr_elem: routine to XDR each element
  */
 bool_t
-xdr_vector(xdrs, basep, nelem, elemsize, xdr_elem)
-	register XDR *xdrs;
-	register char *basep;
-	register u_int nelem;
-	register u_int elemsize;
-	register xdrproc_t xdr_elem;
+xdr_vector(
+	register XDR *xdrs,
+	register char *basep,
+	register u_int nelem,
+	register u_int elemsize,
+	register xdrproc_t xdr_elem)
 {
 	register u_int i;
 	register char *elptr;
diff --git a/cpukit/librpc/src/xdr/xdr_float.c b/cpukit/librpc/src/xdr/xdr_float.c
index 2fe56b9b4d..598d68cf46 100644
--- a/cpukit/librpc/src/xdr/xdr_float.c
+++ b/cpukit/librpc/src/xdr/xdr_float.c
@@ -114,9 +114,9 @@ static struct sgl_limits {
 
 
 bool_t
-xdr_float(xdrs, fp)
-	register XDR *xdrs;
-	register float *fp;
+xdr_float(
+	register XDR *xdrs,
+	register float *fp)
 {
 #ifdef IEEEFP
 	bool_t rv;
@@ -221,9 +221,9 @@ static struct dbl_limits {
 
 
 bool_t
-xdr_double(xdrs, dp)
-	register XDR *xdrs;
-	double *dp;
+xdr_double(
+	register XDR *xdrs,
+	double *dp)
 {
 #ifdef IEEEFP
 	register int32_t *i32p;
diff --git a/cpukit/librpc/src/xdr/xdr_reference.c b/cpukit/librpc/src/xdr/xdr_reference.c
index 41ac34b220..80d03392e6 100644
--- a/cpukit/librpc/src/xdr/xdr_reference.c
+++ b/cpukit/librpc/src/xdr/xdr_reference.c
@@ -60,11 +60,11 @@ static char *rcsid = "$FreeBSD: src/lib/libc/xdr/xdr_reference.c,v 1.8 1999/08/2
  * proc is the routine to handle the referenced structure.
  */
 bool_t
-xdr_reference(xdrs, pp, size, proc)
-	register XDR *xdrs;
-	caddr_t *pp;		/* the pointer to work on */
-	u_int size;		/* size of the object pointed to */
-	xdrproc_t proc;		/* xdr routine to handle the object */
+xdr_reference(
+	register XDR *xdrs,
+	caddr_t *pp,		/* the pointer to work on */
+	u_int size,		/* size of the object pointed to */
+	xdrproc_t proc)		/* xdr routine to handle the object */
 {
 	register caddr_t loc = *pp;
 	register bool_t stat;
@@ -117,11 +117,11 @@ xdr_reference(xdrs, pp, size, proc)
  *
  */
 bool_t
-xdr_pointer(xdrs,objpp,obj_size,xdr_obj)
-	register XDR *xdrs;
-	char **objpp;
-	u_int obj_size;
-	xdrproc_t xdr_obj;
+xdr_pointer(
+	register XDR *xdrs,
+	char **objpp,
+	u_int obj_size,
+	xdrproc_t xdr_obj)
 {
 
 	bool_t more_data;