ANSIfy, whitespace and comment adjustments, to simplify comparing these

files with NetBSD / OpenBSD versions.

1 files changed, 22 insertions, 30 deletions

diff --git a/lib/libstand/rpc.c b/lib/libstand/rpc.c
index 49ddb9d..ee155f6 100644
--- a/lib/libstand/rpc.c
+++ b/lib/libstand/rpc.c
@@ -108,13 +108,8 @@ int rpc_port = 0x400;	/* predecrement */
  * Note: Caller must leave room for headers.
  */
 ssize_t
-rpc_call(d, prog, vers, proc, sdata, slen, rdata, rlen)
-	struct iodesc *d;
-	n_long prog, vers, proc;
-	void *sdata;
-	size_t slen;
-	void *rdata;
-	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)
 {
 	ssize_t cc;
 	struct auth_info *auth;
@@ -232,11 +227,7 @@ rpc_call(d, prog, vers, proc, sdata, slen, rdata, rlen)
  * Remaining checks are done by callrpc
  */
 static ssize_t
-recvrpc(d, pkt, len, tleft)
-	struct iodesc *d;
-	void *pkt;
-	size_t len;
-	time_t tleft;
+recvrpc(struct iodesc *d, void *pkt, size_t len, time_t tleft)
 {
 	struct rpc_reply *reply;
 	ssize_t	n;
@@ -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 */
@@ -324,12 +312,15 @@ struct pmap_list {
 	int 	port;		/* host order */
 } rpc_pmap_list[PMAP_NUM];
 
-/* return port number in host order, or -1 */
+/*
+ * return port number in host order, or -1.
+ * arguments are:
+ *  addr .. server, net order.
+ *  prog .. host order.
+ *  vers .. host order.
+ */
 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;
 
@@ -343,12 +334,15 @@ rpc_pmap_getcache(addr, prog, vers)
 	return (-1);
 }
 
+/*
+ * arguments are:
+ *  addr .. server, net order.
+ *  prog .. host order.
+ *  vers .. host order.
+ *  port .. host order.
+ */
 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;
 
@@ -375,12 +369,10 @@ rpc_pmap_putcache(addr, prog, vers, port)
 /*
  * Request a port number from the port mapper.
  * Returns the port in host order.
+ * prog and vers are host order.
  */
 int
-rpc_getport(d, prog, vers)
-	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 */