protos and ansi

3 files changed, 87 insertions, 153 deletions

diff --git a/usr.sbin/rpc.lockd/lockd.c b/usr.sbin/rpc.lockd/lockd.c
index af7d4eacf91..727ee524fd8 100644
--- a/usr.sbin/rpc.lockd/lockd.c
+++ b/usr.sbin/rpc.lockd/lockd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lockd.c,v 1.6 2003/06/11 23:33:29 deraadt Exp $	*/
+/*	$OpenBSD: lockd.c,v 1.7 2003/07/06 21:26:14 deraadt Exp $	*/
 
 /*
  * Copyright (c) 1995
@@ -49,17 +49,15 @@
 
 #include "lockd.h"
 
-extern void nlm_prog_1(struct svc_req, SVCXPRT);
-extern void nlm_prog_3(struct svc_req, SVCXPRT);
+extern void nlm_prog_1(struct svc_req *, SVCXPRT *);
+extern void nlm_prog_3(struct svc_req *, SVCXPRT *);
 
 int     debug_level = 0;	/* Zero means no debugging syslog() calls	 */
 
 int     _rpcsvcdirty;
 
 int
-main(argc, argv)
-	int     argc;
-	char  **argv;
+main(int argc, char *argv[])
 {
 	SVCXPRT *transp;
 
@@ -84,12 +82,12 @@ main(argc, argv)
 		exit(1);
 	}
 	if (!svc_register(transp, NLM_PROG, NLM_VERS,
-	    (void (*) ()) nlm_prog_1, IPPROTO_UDP)) {
+	    (void (*) (struct svc_req *, SVCXPRT *)) nlm_prog_1, IPPROTO_UDP)) {
 		fprintf(stderr, "unable to register (NLM_PROG, NLM_VERS, udp).\n");
 		exit(1);
 	}
 	if (!svc_register(transp, NLM_PROG, NLM_VERSX,
-	    (void (*) ()) nlm_prog_3, IPPROTO_UDP)) {
+	    (void (*) (struct svc_req *, SVCXPRT *)) nlm_prog_3, IPPROTO_UDP)) {
 		fprintf(stderr, "unable to register (NLM_PROG, NLM_VERSX, udp).\n");
 		exit(1);
 	}
@@ -99,12 +97,12 @@ main(argc, argv)
 		exit(1);
 	}
 	if (!svc_register(transp, NLM_PROG, NLM_VERS,
-	    (void (*) ()) nlm_prog_1, IPPROTO_TCP)) {
+	    (void (*) (struct svc_req *, SVCXPRT *)) nlm_prog_1, IPPROTO_TCP)) {
 		fprintf(stderr, "unable to register (NLM_PROG, NLM_VERS, tcp).\n");
 		exit(1);
 	}
 	if (!svc_register(transp, NLM_PROG, NLM_VERSX,
-	    (void (*) ()) nlm_prog_3, IPPROTO_TCP)) {
+	    (void (*) (struct svc_req *, SVCXPRT *)) nlm_prog_3, IPPROTO_TCP)) {
 		fprintf(stderr, "unable to register (NLM_PROG, NLM_VERSX, tcp).\n");
 		exit(1);
 	}
diff --git a/usr.sbin/rpc.lockd/procs.c b/usr.sbin/rpc.lockd/procs.c
index 2edca80d499..2c9f7a9470f 100644
--- a/usr.sbin/rpc.lockd/procs.c
+++ b/usr.sbin/rpc.lockd/procs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: procs.c,v 1.10 2002/05/29 18:39:00 deraadt Exp $	*/
+/*	$OpenBSD: procs.c,v 1.11 2003/07/06 21:26:14 deraadt Exp $	*/
 
 /*
  * Copyright (c) 1995
@@ -53,9 +53,7 @@
 #define	CLIENT_CACHE_LIFETIME	120	/* In seconds			 */
 
 static void 
-log_from_addr(fun_name, req)
-	char *fun_name;
-	struct svc_req *req;
+log_from_addr(char *fun_name, struct svc_req *req)
 {
 	struct	sockaddr_in *addr;
 	struct	hostent *host;
@@ -78,8 +76,7 @@ static struct in_addr clnt_cache_addr[CLIENT_CACHE_SIZE];
 static int clnt_cache_next_to_use = 0;
 
 static CLIENT *
-get_client(host_addr)
-	struct sockaddr_in *host_addr;
+get_client(struct sockaddr_in *host_addr)
 {
 	CLIENT *client;
 	int     sock_no, i;
@@ -145,10 +142,7 @@ get_client(host_addr)
 
 
 static void 
-transmit_result(opcode, result, req)
-	int opcode;
-	nlm_res *result;
-	struct svc_req *req;
+transmit_result(int opcode, nlm_res *result, struct svc_req *req)
 {
 	static char dummy;
 	struct sockaddr_in *addr;
@@ -169,9 +163,7 @@ transmit_result(opcode, result, req)
 }
 
 nlm_testres *
-nlm_test_1_svc(arg, rqstp)
-	nlm_testargs *arg;
-	struct svc_req *rqstp;
+nlm_test_1_svc(nlm_testargs *arg, struct svc_req *rqstp)
 {
 	static nlm_testres res;
 
@@ -183,9 +175,7 @@ nlm_test_1_svc(arg, rqstp)
 }
 
 void *
-nlm_test_msg_1_svc(arg, rqstp)
-	nlm_testargs *arg;
-	struct svc_req *rqstp;
+nlm_test_msg_1_svc(nlm_testargs *arg, struct svc_req *rqstp)
 {
 	nlm_testres res;
 	static char dummy;
@@ -213,9 +203,7 @@ nlm_test_msg_1_svc(arg, rqstp)
 }
 
 nlm_res *
-nlm_lock_1_svc(arg, rqstp)
-	nlm_lockargs *arg;
-	struct svc_req *rqstp;
+nlm_lock_1_svc(nlm_lockargs *arg, struct svc_req *rqstp)
 {
 	static nlm_res res;
 
@@ -227,9 +215,7 @@ nlm_lock_1_svc(arg, rqstp)
 }
 
 void *
-nlm_lock_msg_1_svc(arg, rqstp)
-	nlm_lockargs *arg;
-	struct svc_req *rqstp;
+nlm_lock_msg_1_svc(nlm_lockargs *arg, struct svc_req *rqstp)
 {
 	static nlm_res res;
 
@@ -242,9 +228,7 @@ nlm_lock_msg_1_svc(arg, rqstp)
 }
 
 nlm_res *
-nlm_cancel_1_svc(arg, rqstp)
-	nlm_cancargs *arg;
-	struct svc_req *rqstp;
+nlm_cancel_1_svc(nlm_cancargs *arg, struct svc_req *rqstp)
 {
 	static nlm_res res;
 
@@ -256,9 +240,7 @@ nlm_cancel_1_svc(arg, rqstp)
 }
 
 void *
-nlm_cancel_msg_1_svc(arg, rqstp)
-	nlm_cancargs *arg;
-	struct svc_req *rqstp;
+nlm_cancel_msg_1_svc(nlm_cancargs *arg, struct svc_req *rqstp)
 {
 	static nlm_res res;
 
@@ -271,9 +253,7 @@ nlm_cancel_msg_1_svc(arg, rqstp)
 }
 
 nlm_res *
-nlm_unlock_1_svc(arg, rqstp)
-	nlm_unlockargs *arg;
-	struct svc_req *rqstp;
+nlm_unlock_1_svc(nlm_unlockargs *arg, struct svc_req *rqstp)
 {
 	static nlm_res res;
 
@@ -285,9 +265,7 @@ nlm_unlock_1_svc(arg, rqstp)
 }
 
 void *
-nlm_unlock_msg_1_svc(arg, rqstp)
-	nlm_unlockargs *arg;
-	struct svc_req *rqstp;
+nlm_unlock_msg_1_svc(nlm_unlockargs *arg, struct svc_req *rqstp)
 {
 	static nlm_res res;
 
@@ -300,9 +278,7 @@ nlm_unlock_msg_1_svc(arg, rqstp)
 }
 
 nlm_res *
-nlm_granted_1_svc(arg, rqstp)
-	nlm_testargs *arg;
-	struct svc_req *rqstp;
+nlm_granted_1_svc(nlm_testargs *arg, struct svc_req *rqstp)
 {
 	static nlm_res res;
 
@@ -314,9 +290,7 @@ nlm_granted_1_svc(arg, rqstp)
 }
 
 void *
-nlm_granted_msg_1_svc(arg, rqstp)
-	nlm_testargs *arg;
-	struct svc_req *rqstp;
+nlm_granted_msg_1_svc(nlm_testargs *arg, struct svc_req *rqstp)
 {
 	nlm_res res;
 
@@ -329,9 +303,7 @@ nlm_granted_msg_1_svc(arg, rqstp)
 }
 
 void *
-nlm_test_res_1_svc(arg, rqstp)
-	nlm_testres *arg;
-	struct svc_req *rqstp;
+nlm_test_res_1_svc(nlm_testres *arg, struct svc_req *rqstp)
 {
 	if (debug_level)
 		log_from_addr("nlm_test_res", rqstp);
@@ -339,9 +311,7 @@ nlm_test_res_1_svc(arg, rqstp)
 }
 
 void *
-nlm_lock_res_1_svc(arg, rqstp)
-	nlm_res *arg;
-	struct svc_req *rqstp;
+nlm_lock_res_1_svc(nlm_res *arg, struct svc_req *rqstp)
 {
 	if (debug_level)
 		log_from_addr("nlm_lock_res", rqstp);
@@ -350,9 +320,7 @@ nlm_lock_res_1_svc(arg, rqstp)
 }
 
 void *
-nlm_cancel_res_1_svc(arg, rqstp)
-        nlm_res *arg;
-        struct svc_req *rqstp;
+nlm_cancel_res_1_svc(nlm_res *arg, struct svc_req *rqstp)
 {
 	if (debug_level)
 		log_from_addr("nlm_cancel_res", rqstp);
@@ -360,9 +328,7 @@ nlm_cancel_res_1_svc(arg, rqstp)
 }
 
 void *
-nlm_unlock_res_1_svc(arg, rqstp)
-	nlm_res *arg;
-	struct svc_req *rqstp;
+nlm_unlock_res_1_svc(nlm_res *arg, struct svc_req *rqstp)
 {
 	if (debug_level)
 		log_from_addr("nlm_unlock_res", rqstp);
@@ -370,9 +336,7 @@ nlm_unlock_res_1_svc(arg, rqstp)
 }
 
 void *
-nlm_granted_res_1_svc(arg, rqstp)
-	nlm_res *arg;
-	struct svc_req *rqstp;
+nlm_granted_res_1_svc(nlm_res *arg, struct svc_req *rqstp)
 {
 	if (debug_level)
 		log_from_addr("nlm_granted_res", rqstp);
@@ -380,9 +344,7 @@ nlm_granted_res_1_svc(arg, rqstp)
 }
 
 nlm_shareres *
-nlm_share_3_svc(arg, rqstp)
-	nlm_shareargs *arg;
-	struct svc_req *rqstp;
+nlm_share_3_svc(nlm_shareargs *arg, struct svc_req *rqstp)
 {
 	static nlm_shareres res;
 
@@ -395,9 +357,7 @@ nlm_share_3_svc(arg, rqstp)
 }
 
 nlm_shareres *
-nlm_unshare_3_svc(arg, rqstp)
-	nlm_shareargs *arg;
-	struct svc_req *rqstp;
+nlm_unshare_3_svc(nlm_shareargs *arg, struct svc_req *rqstp)
 {
 	static nlm_shareres res;
 
@@ -410,9 +370,7 @@ nlm_unshare_3_svc(arg, rqstp)
 }
 
 nlm_res *
-nlm_nm_lock_3_svc(arg, rqstp)
-	nlm_lockargs *arg;
-	struct svc_req *rqstp;
+nlm_nm_lock_3_svc(nlm_lockargs *arg, struct svc_req *rqstp)
 {
 	static nlm_res res;
 
@@ -424,9 +382,7 @@ nlm_nm_lock_3_svc(arg, rqstp)
 }
 
 void *
-nlm_free_all_3_svc(arg, rqstp)
-	nlm_notify *arg;
-	struct svc_req *rqstp;
+nlm_free_all_3_svc(nlm_notify *arg, struct svc_req *rqstp)
 {
 	static char dummy;
 
diff --git a/usr.sbin/rpc.lockd/test.c b/usr.sbin/rpc.lockd/test.c
index f177bafe763..bdcda13ac17 100644
--- a/usr.sbin/rpc.lockd/test.c
+++ b/usr.sbin/rpc.lockd/test.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: test.c,v 1.3 1997/09/17 23:09:39 deraadt Exp $	*/
+/*	$OpenBSD: test.c,v 1.4 2003/07/06 21:26:14 deraadt Exp $	*/
 
 #include <rpc/rpc.h>
 #include <rpcsvc/nlm_prot.h>
@@ -12,14 +12,13 @@ static char rcsid[] = "nlm_prot.x,v 1.1 1994/08/04 19:01:48 wollman Exp";
 static struct timeval TIMEOUT = {0, 0};
 
 nlm_testres *
-nlm_test_1(argp, clnt)
-	struct nlm_testargs *argp;
-	CLIENT *clnt;
+nlm_test_1(struct nlm_testargs *argp, CLIENT *clnt)
 {
 	static nlm_testres res;
 
 	bzero((char *) &res, sizeof(res));
-	if (clnt_call(clnt, NLM_TEST, xdr_nlm_testargs, argp, xdr_nlm_testres, &res, TIMEOUT) != RPC_SUCCESS) {
+	if (clnt_call(clnt, NLM_TEST, xdr_nlm_testargs, argp, xdr_nlm_testres,
+	    &res, TIMEOUT) != RPC_SUCCESS) {
 		return (NULL);
 	}
 	return (&res);
@@ -27,15 +26,14 @@ nlm_test_1(argp, clnt)
 
 
 nlm_res *
-nlm_lock_1(argp, clnt)
-	struct nlm_lockargs *argp;
-	CLIENT *clnt;
+nlm_lock_1(struct nlm_lockargs *argp, CLIENT *clnt)
 {
 	enum clnt_stat st;
 	static nlm_res res;
 
 	bzero((char *) &res, sizeof(res));
-	if (st = clnt_call(clnt, NLM_LOCK, xdr_nlm_lockargs, argp, xdr_nlm_res, &res, TIMEOUT) != RPC_SUCCESS) {
+	if (st = clnt_call(clnt, NLM_LOCK, xdr_nlm_lockargs, argp, xdr_nlm_res,
+	    &res, TIMEOUT) != RPC_SUCCESS) {
 		printf("clnt_call returns %d\n", st);
 		clnt_perror(clnt, "humbug");
 		return (NULL);
@@ -45,14 +43,13 @@ nlm_lock_1(argp, clnt)
 
 
 nlm_res *
-nlm_cancel_1(argp, clnt)
-	struct nlm_cancargs *argp;
-	CLIENT *clnt;
+nlm_cancel_1(struct nlm_cancargs *argp, CLIENT *clnt)
 {
 	static nlm_res res;
 
 	bzero((char *) &res, sizeof(res));
-	if (clnt_call(clnt, NLM_CANCEL, xdr_nlm_cancargs, argp, xdr_nlm_res, &res, TIMEOUT) != RPC_SUCCESS) {
+	if (clnt_call(clnt, NLM_CANCEL, xdr_nlm_cancargs, argp, xdr_nlm_res,
+	    &res, TIMEOUT) != RPC_SUCCESS) {
 		return (NULL);
 	}
 	return (&res);
@@ -60,14 +57,13 @@ nlm_cancel_1(argp, clnt)
 
 
 nlm_res *
-nlm_unlock_1(argp, clnt)
-	struct nlm_unlockargs *argp;
-	CLIENT *clnt;
+nlm_unlock_1(struct nlm_unlockargs *argp, CLIENT *clnt)
 {
 	static nlm_res res;
 
 	bzero((char *) &res, sizeof(res));
-	if (clnt_call(clnt, NLM_UNLOCK, xdr_nlm_unlockargs, argp, xdr_nlm_res, &res, TIMEOUT) != RPC_SUCCESS) {
+	if (clnt_call(clnt, NLM_UNLOCK, xdr_nlm_unlockargs, argp, xdr_nlm_res,
+	    &res, TIMEOUT) != RPC_SUCCESS) {
 		return (NULL);
 	}
 	return (&res);
@@ -75,14 +71,13 @@ nlm_unlock_1(argp, clnt)
 
 
 nlm_res *
-nlm_granted_1(argp, clnt)
-	struct nlm_testargs *argp;
-	CLIENT *clnt;
+nlm_granted_1(struct nlm_testargs *argp, CLIENT *clnt)
 {
 	static nlm_res res;
 
 	bzero((char *) &res, sizeof(res));
-	if (clnt_call(clnt, NLM_GRANTED, xdr_nlm_testargs, argp, xdr_nlm_res, &res, TIMEOUT) != RPC_SUCCESS) {
+	if (clnt_call(clnt, NLM_GRANTED, xdr_nlm_testargs, argp, xdr_nlm_res,
+	    &res, TIMEOUT) != RPC_SUCCESS) {
 		return (NULL);
 	}
 	return (&res);
@@ -90,14 +85,13 @@ nlm_granted_1(argp, clnt)
 
 
 void   *
-nlm_test_msg_1(argp, clnt)
-	struct nlm_testargs *argp;
-	CLIENT *clnt;
+nlm_test_msg_1(struct nlm_testargs *argp, CLIENT *clnt)
 {
 	static char res;
 
 	bzero((char *) &res, sizeof(res));
-	if (clnt_call(clnt, NLM_TEST_MSG, xdr_nlm_testargs, argp, xdr_void, &res, TIMEOUT) != RPC_SUCCESS) {
+	if (clnt_call(clnt, NLM_TEST_MSG, xdr_nlm_testargs, argp, xdr_void,
+	    &res, TIMEOUT) != RPC_SUCCESS) {
 		return (NULL);
 	}
 	return ((void *) &res);
@@ -105,9 +99,7 @@ nlm_test_msg_1(argp, clnt)
 
 
 void   *
-nlm_lock_msg_1(argp, clnt)
-	struct nlm_lockargs *argp;
-	CLIENT *clnt;
+nlm_lock_msg_1(struct nlm_lockargs *argp, CLIENT *clnt)
 {
 	static char res;
 
@@ -121,14 +113,13 @@ nlm_lock_msg_1(argp, clnt)
 
 
 void   *
-nlm_cancel_msg_1(argp, clnt)
-	struct nlm_cancargs *argp;
-	CLIENT *clnt;
+nlm_cancel_msg_1(struct nlm_cancargs *argp, CLIENT *clnt)
 {
 	static char res;
 
 	bzero((char *) &res, sizeof(res));
-	if (clnt_call(clnt, NLM_CANCEL_MSG, xdr_nlm_cancargs, argp, xdr_void, &res, TIMEOUT) != RPC_SUCCESS) {
+	if (clnt_call(clnt, NLM_CANCEL_MSG, xdr_nlm_cancargs, argp, xdr_void,
+	    &res, TIMEOUT) != RPC_SUCCESS) {
 		return (NULL);
 	}
 	return ((void *) &res);
@@ -136,14 +127,13 @@ nlm_cancel_msg_1(argp, clnt)
 
 
 void   *
-nlm_unlock_msg_1(argp, clnt)
-	struct nlm_unlockargs *argp;
-	CLIENT *clnt;
+nlm_unlock_msg_1(struct nlm_unlockargs *argp, CLIENT *clnt)
 {
 	static char res;
 
 	bzero((char *) &res, sizeof(res));
-	if (clnt_call(clnt, NLM_UNLOCK_MSG, xdr_nlm_unlockargs, argp, xdr_void, &res, TIMEOUT) != RPC_SUCCESS) {
+	if (clnt_call(clnt, NLM_UNLOCK_MSG, xdr_nlm_unlockargs, argp, xdr_void,
+	    &res, TIMEOUT) != RPC_SUCCESS) {
 		return (NULL);
 	}
 	return ((void *) &res);
@@ -151,14 +141,13 @@ nlm_unlock_msg_1(argp, clnt)
 
 
 void   *
-nlm_granted_msg_1(argp, clnt)
-	struct nlm_testargs *argp;
-	CLIENT *clnt;
+nlm_granted_msg_1(struct nlm_testargs *argp, CLIENT *clnt)
 {
 	static char res;
 
 	bzero((char *) &res, sizeof(res));
-	if (clnt_call(clnt, NLM_GRANTED_MSG, xdr_nlm_testargs, argp, xdr_void, &res, TIMEOUT) != RPC_SUCCESS) {
+	if (clnt_call(clnt, NLM_GRANTED_MSG, xdr_nlm_testargs, argp, xdr_void,
+	    &res, TIMEOUT) != RPC_SUCCESS) {
 		return (NULL);
 	}
 	return ((void *) &res);
@@ -166,14 +155,13 @@ nlm_granted_msg_1(argp, clnt)
 
 
 void   *
-nlm_test_res_1(argp, clnt)
-	nlm_testres *argp;
-	CLIENT *clnt;
+nlm_test_res_1(nlm_testres *argp, CLIENT *clnt)
 {
 	static char res;
 
 	bzero((char *) &res, sizeof(res));
-	if (clnt_call(clnt, NLM_TEST_RES, xdr_nlm_testres, argp, xdr_void, &res, TIMEOUT) != RPC_SUCCESS) {
+	if (clnt_call(clnt, NLM_TEST_RES, xdr_nlm_testres, argp, xdr_void,
+	    &res, TIMEOUT) != RPC_SUCCESS) {
 		return (NULL);
 	}
 	return ((void *) &res);
@@ -181,14 +169,13 @@ nlm_test_res_1(argp, clnt)
 
 
 void   *
-nlm_lock_res_1(argp, clnt)
-	nlm_res *argp;
-	CLIENT *clnt;
+nlm_lock_res_1(nlm_res *argp, CLIENT *clnt)
 {
 	static char res;
 
 	bzero((char *) &res, sizeof(res));
-	if (clnt_call(clnt, NLM_LOCK_RES, xdr_nlm_res, argp, xdr_void, &res, TIMEOUT) != RPC_SUCCESS) {
+	if (clnt_call(clnt, NLM_LOCK_RES, xdr_nlm_res, argp, xdr_void,
+	    &res, TIMEOUT) != RPC_SUCCESS) {
 		return (NULL);
 	}
 	return ((void *) &res);
@@ -196,14 +183,13 @@ nlm_lock_res_1(argp, clnt)
 
 
 void   *
-nlm_cancel_res_1(argp, clnt)
-	nlm_res *argp;
-	CLIENT *clnt;
+nlm_cancel_res_1(nlm_res *argp, CLIENT *clnt)
 {
 	static char res;
 
 	bzero((char *) &res, sizeof(res));
-	if (clnt_call(clnt, NLM_CANCEL_RES, xdr_nlm_res, argp, xdr_void, &res, TIMEOUT) != RPC_SUCCESS) {
+	if (clnt_call(clnt, NLM_CANCEL_RES, xdr_nlm_res, argp, xdr_void,
+	    &res, TIMEOUT) != RPC_SUCCESS) {
 		return (NULL);
 	}
 	return ((void *) &res);
@@ -211,14 +197,13 @@ nlm_cancel_res_1(argp, clnt)
 
 
 void   *
-nlm_unlock_res_1(argp, clnt)
-	nlm_res *argp;
-	CLIENT *clnt;
+nlm_unlock_res_1(nlm_res *argp, CLIENT *clnt)
 {
 	static char res;
 
 	bzero((char *) &res, sizeof(res));
-	if (clnt_call(clnt, NLM_UNLOCK_RES, xdr_nlm_res, argp, xdr_void, &res, TIMEOUT) != RPC_SUCCESS) {
+	if (clnt_call(clnt, NLM_UNLOCK_RES, xdr_nlm_res, argp, xdr_void,
+	    &res, TIMEOUT) != RPC_SUCCESS) {
 		return (NULL);
 	}
 	return ((void *) &res);
@@ -226,14 +211,13 @@ nlm_unlock_res_1(argp, clnt)
 
 
 void   *
-nlm_granted_res_1(argp, clnt)
-	nlm_res *argp;
-	CLIENT *clnt;
+nlm_granted_res_1(nlm_res *argp, CLIENT *clnt)
 {
 	static char res;
 
 	bzero((char *) &res, sizeof(res));
-	if (clnt_call(clnt, NLM_GRANTED_RES, xdr_nlm_res, argp, xdr_void, &res, TIMEOUT) != RPC_SUCCESS) {
+	if (clnt_call(clnt, NLM_GRANTED_RES, xdr_nlm_res, argp, xdr_void,
+	    &res, TIMEOUT) != RPC_SUCCESS) {
 		return (NULL);
 	}
 	return ((void *) &res);
@@ -241,14 +225,13 @@ nlm_granted_res_1(argp, clnt)
 
 
 nlm_shareres *
-nlm_share_3(argp, clnt)
-	nlm_shareargs *argp;
-	CLIENT *clnt;
+nlm_share_3(nlm_shareargs *argp, CLIENT *clnt)
 {
 	static nlm_shareres res;
 
 	bzero((char *) &res, sizeof(res));
-	if (clnt_call(clnt, NLM_SHARE, xdr_nlm_shareargs, argp, xdr_nlm_shareres, &res, TIMEOUT) != RPC_SUCCESS) {
+	if (clnt_call(clnt, NLM_SHARE, xdr_nlm_shareargs, argp, xdr_nlm_shareres,
+	    &res, TIMEOUT) != RPC_SUCCESS) {
 		return (NULL);
 	}
 	return (&res);
@@ -256,14 +239,13 @@ nlm_share_3(argp, clnt)
 
 
 nlm_shareres *
-nlm_unshare_3(argp, clnt)
-	nlm_shareargs *argp;
-	CLIENT *clnt;
+nlm_unshare_3(nlm_shareargs *argp, CLIENT *clnt)
 {
 	static nlm_shareres res;
 
 	bzero((char *) &res, sizeof(res));
-	if (clnt_call(clnt, NLM_UNSHARE, xdr_nlm_shareargs, argp, xdr_nlm_shareres, &res, TIMEOUT) != RPC_SUCCESS) {
+	if (clnt_call(clnt, NLM_UNSHARE, xdr_nlm_shareargs, argp, xdr_nlm_shareres,
+	    &res, TIMEOUT) != RPC_SUCCESS) {
 		return (NULL);
 	}
 	return (&res);
@@ -271,14 +253,13 @@ nlm_unshare_3(argp, clnt)
 
 
 nlm_res *
-nlm_nm_lock_3(argp, clnt)
-	nlm_lockargs *argp;
-	CLIENT *clnt;
+nlm_nm_lock_3(nlm_lockargs *argp, CLIENT *clnt)
 {
 	static nlm_res res;
 
 	bzero((char *) &res, sizeof(res));
-	if (clnt_call(clnt, NLM_NM_LOCK, xdr_nlm_lockargs, argp, xdr_nlm_res, &res, TIMEOUT) != RPC_SUCCESS) {
+	if (clnt_call(clnt, NLM_NM_LOCK, xdr_nlm_lockargs, argp, xdr_nlm_res,
+	    &res, TIMEOUT) != RPC_SUCCESS) {
 		return (NULL);
 	}
 	return (&res);
@@ -286,14 +267,13 @@ nlm_nm_lock_3(argp, clnt)
 
 
 void   *
-nlm_free_all_3(argp, clnt)
-	nlm_notify *argp;
-	CLIENT *clnt;
+nlm_free_all_3(nlm_notify *argp, CLIENT *clnt)
 {
 	static char res;
 
 	bzero((char *) &res, sizeof(res));
-	if (clnt_call(clnt, NLM_FREE_ALL, xdr_nlm_notify, argp, xdr_void, &res, TIMEOUT) != RPC_SUCCESS) {
+	if (clnt_call(clnt, NLM_FREE_ALL, xdr_nlm_notify, argp, xdr_void,
+	    &res, TIMEOUT) != RPC_SUCCESS) {
 		return (NULL);
 	}
 	return ((void *) &res);