ansification and knf and protos

1 files changed, 11 insertions, 35 deletions

diff --git a/sys/lib/libsa/rpc.c b/sys/lib/libsa/rpc.c
index 35b692bc38f..2e51b4f835c 100644
--- a/sys/lib/libsa/rpc.c
+++ b/sys/lib/libsa/rpc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rpc.c,v 1.12 2003/06/01 17:00:33 deraadt Exp $	*/
+/*	$OpenBSD: rpc.c,v 1.13 2003/08/11 06:23:09 deraadt Exp $	*/
 /*	$NetBSD: rpc.c,v 1.16 1996/10/13 02:29:06 christos Exp $	*/
 
 /*
@@ -108,15 +108,10 @@ int rpc_port = 0x400;	/* predecrement */
  * Note: Caller must leave room for headers.
  */
 ssize_t
-rpc_call(d, prog, vers, proc, sdata, slen, rdata, rlen)
-	register struct iodesc *d;
-	register n_long prog, vers, proc;
-	register void *sdata;
-	register size_t slen;
-	register void *rdata;
-	register size_t rlen;
+rpc_call(struct iodesc *d, n_long prog, n_long vers, n_long proc, void *sdata,
+    size_t slen, void *rdata, size_t rlen)
 {
-	register ssize_t cc;
+	ssize_t cc;
 	struct auth_info *auth;
 	struct rpc_call *call;
 	struct rpc_reply *reply;
@@ -232,13 +227,9 @@ rpc_call(d, prog, vers, proc, sdata, slen, rdata, rlen)
  * Remaining checks are done by callrpc
  */
 static ssize_t
-recvrpc(d, pkt, len, tleft)
-	register struct iodesc *d;
-	register void *pkt;
-	register size_t len;
-	time_t tleft;
+recvrpc(struct iodesc *d, void *pkt, size_t len, time_t tleft)
 {
-	register struct rpc_reply *reply;
+	struct rpc_reply *reply;
 	ssize_t	n;
 	int	x;
 
@@ -288,10 +279,7 @@ recvrpc(d, pkt, len, tleft)
  * dig out the IP address/port from the headers.
  */
 void
-rpc_fromaddr(pkt, addr, port)
-	void		*pkt;
-	struct in_addr	*addr;
-	u_short		*port;
+rpc_fromaddr(void *pkt, struct in_addr *addr, u_short *port)
 {
 	struct hackhdr {
 		/* Tail of IP header: just IP addresses */
@@ -326,29 +314,20 @@ struct pmap_list {
 
 /* return port number in host order, or -1 */
 int
-rpc_pmap_getcache(addr, prog, vers)
-	struct in_addr	addr;	/* server, net order */
-	u_int		prog;	/* host order */
-	u_int		vers;	/* host order */
+rpc_pmap_getcache(struct in_addr addr, u_int prog, u_int vers)
 {
 	struct pmap_list *pl;
 
 	for (pl = rpc_pmap_list; pl < &rpc_pmap_list[rpc_pmap_num]; pl++) {
 		if (pl->addr.s_addr == addr.s_addr &&
-			pl->prog == prog && pl->vers == vers )
-		{
+		    pl->prog == prog && pl->vers == vers)
 			return (pl->port);
-		}
 	}
 	return (-1);
 }
 
 void
-rpc_pmap_putcache(addr, prog, vers, port)
-	struct in_addr	addr;	/* server, net order */
-	u_int		prog;	/* host order */
-	u_int		vers;	/* host order */
-	int		port;	/* host order */
+rpc_pmap_putcache(struct in_addr addr, u_int prog, u_int vers, int port)
 {
 	struct pmap_list *pl;
 
@@ -377,10 +356,7 @@ rpc_pmap_putcache(addr, prog, vers, port)
  * Returns the port in host order.
  */
 int
-rpc_getport(d, prog, vers)
-	register struct iodesc *d;
-	n_long prog;	/* host order */
-	n_long vers;	/* host order */
+rpc_getport(struct iodesc *d, n_long prog, n_long vers)
 {
 	struct args {
 		n_long	prog;		/* call program */