From 58f0ca6c417a805e933ed0e1afabc2b464c3f384 Mon Sep 17 00:00:00 2001
From: Sascha Wildner <swildner@dragonflybsd.org>
Date: Sun, 25 Nov 2007 14:33:02 +0000
Subject: [PATCH] * Add prototype for callrpc()

* Fix function type for callrpc() in rpc(3)

* Raise WARNS to 2 for librpcsvc, fix warnings and ansify
---
 include/rpc/rpc.h         |  5 ++++-
 lib/libc/rpc/rpc.3        |  3 ++-
 lib/librpcsvc/Makefile    |  3 ++-
 lib/librpcsvc/rnusers.c   |  4 ++--
 lib/librpcsvc/rstat.c     |  8 +++-----
 lib/librpcsvc/rwall.c     |  5 ++---
 lib/librpcsvc/secretkey.c |  7 ++-----
 lib/librpcsvc/xcrypt.c    | 27 +++++++--------------------
 lib/librpcsvc/yp_passwd.c |  9 ++++-----
 lib/librpcsvc/yp_update.c | 12 +++---------
 10 files changed, 31 insertions(+), 52 deletions(-)

diff --git a/include/rpc/rpc.h b/include/rpc/rpc.h
index d1acc44652..14add4a22e 100644
--- a/include/rpc/rpc.h
+++ b/include/rpc/rpc.h
@@ -29,7 +29,7 @@
  *	from: @(#)rpc.h 1.9 88/02/08 SMI
  *	from: @(#)rpc.h	2.4 89/07/11 4.0 RPCSRC
  * $FreeBSD: src/include/rpc/rpc.h,v 1.12 2000/01/26 09:02:40 shin Exp $
- * $DragonFly: src/include/rpc/rpc.h,v 1.4 2004/02/26 13:58:26 joerg Exp $
+ * $DragonFly: src/include/rpc/rpc.h,v 1.5 2007/11/25 14:33:02 swildner Exp $
  */
 
 /*
@@ -80,6 +80,9 @@ struct rpcent {
 };
 
 __BEGIN_DECLS
+int		 callrpc(char *, int, int, int, xdrproc_t, char *, xdrproc_t,
+			 char *);
+
 struct rpcent 	*getrpcbyname(char *);
 struct rpcent 	*getrpcbynumber(int);
 struct rpcent 	*getrpcent(void);
diff --git a/lib/libc/rpc/rpc.3 b/lib/libc/rpc/rpc.3
index 6b0cc427b1..f4092ca331 100644
--- a/lib/libc/rpc/rpc.3
+++ b/lib/libc/rpc/rpc.3
@@ -1,6 +1,6 @@
 .\" @(#)rpc.3n	2.4 88/08/08 4.0 RPCSRC; from 1.19 88/06/24 SMI
 .\" $FreeBSD: src/lib/libc/rpc/rpc.3,v 1.11.2.5 2001/12/14 18:33:56 ru Exp $
-.\" $DragonFly: src/lib/libc/rpc/rpc.3,v 1.6 2007/11/23 23:16:36 swildner Exp $
+.\" $DragonFly: src/lib/libc/rpc/rpc.3,v 1.7 2007/11/25 14:33:02 swildner Exp $
 .\"
 .Dd February 16, 1988
 .Dt RPC 3
@@ -106,6 +106,7 @@ Calls
 with the appropriate parameters.
 .Pp
 .It Xo
+.Ft int
 .Fo callrpc
 .Fa "char *host"
 .Fa "u_long prognum"
diff --git a/lib/librpcsvc/Makefile b/lib/librpcsvc/Makefile
index c6bcddaaf3..ae48a49395 100644
--- a/lib/librpcsvc/Makefile
+++ b/lib/librpcsvc/Makefile
@@ -1,10 +1,11 @@
 #	from: @(#)Makefile    5.10 (Berkeley) 6/24/90
 # $FreeBSD: src/lib/librpcsvc/Makefile,v 1.13 1999/08/28 00:05:23 peter Exp $
-# $DragonFly: src/lib/librpcsvc/Makefile,v 1.2 2003/06/17 04:26:51 dillon Exp $
+# $DragonFly: src/lib/librpcsvc/Makefile,v 1.3 2007/11/25 14:33:02 swildner Exp $
 
 .PATH: ${DESTDIR}/usr/include/rpcsvc
 
 LIB=    rpcsvc
+WARNS?=	2
 
 RPCSRCS= klm_prot.x mount.x nfs_prot.x nlm_prot.x rex.x rnusers.x \
 	rquota.x rstat.x rwall.x sm_inter.x spray.x yppasswd.x ypxfrd.x \
diff --git a/lib/librpcsvc/rnusers.c b/lib/librpcsvc/rnusers.c
index c5ee97dc7e..5815544aea 100644
--- a/lib/librpcsvc/rnusers.c
+++ b/lib/librpcsvc/rnusers.c
@@ -28,7 +28,7 @@
  * Mountain View, California  94043
  *
  * @(#)rnusers.c	1.2 91/03/11 TIRPC 1.0; from 1.7 89/03/24 SMI
- * $DragonFly: src/lib/librpcsvc/rnusers.c,v 1.3 2005/08/04 17:27:09 drhodus Exp $
+ * $DragonFly: src/lib/librpcsvc/rnusers.c,v 1.4 2007/11/25 14:33:02 swildner Exp $
  */
 
 /*
@@ -43,7 +43,7 @@
 #include <rpcsvc/rnusers.h>
 
 int
-rusers(char *host, struct utmpidlearr *up)
+rusers(char *host, utmpidlearr *up)
 {
 	return (callrpc(host, RUSERSPROG, RUSERSVERS_IDLE, RUSERSPROC_NAMES,
 			xdr_void, (char *) NULL,
diff --git a/lib/librpcsvc/rstat.c b/lib/librpcsvc/rstat.c
index b0a57c691a..f10269aaed 100644
--- a/lib/librpcsvc/rstat.c
+++ b/lib/librpcsvc/rstat.c
@@ -28,6 +28,7 @@
  * Mountain View, California  94043
  *
  * @(#)rstat.c	1.2 91/03/11 TIRPC 1.0; from 1.6 89/03/24 SMI
+ * $DragonFly: src/lib/librpcsvc/rstat.c,v 1.3 2007/11/25 14:33:02 swildner Exp $
  */
 
 /*
@@ -41,9 +42,7 @@
 #include <rpcsvc/rstat.h>
 
 int
-rstat(host, statp)
-	char *host;
-	struct statstime *statp;
+rstat(char *host, struct statstime *statp)
 {
 	return (callrpc(host, RSTATPROG, RSTATVERS_TIME, RSTATPROC_STATS,
 			xdr_void, (char *) NULL,
@@ -51,8 +50,7 @@ rstat(host, statp)
 }
 
 int
-havedisk(host)
-	char *host;
+havedisk(char *host)
 {
 	long have;
 	
diff --git a/lib/librpcsvc/rwall.c b/lib/librpcsvc/rwall.c
index 3c5ab59aad..14e4ab05e6 100644
--- a/lib/librpcsvc/rwall.c
+++ b/lib/librpcsvc/rwall.c
@@ -28,6 +28,7 @@
  * Mountain View, California  94043
  *
  * @(#)rwall.c	1.2 91/03/11 TIRPC 1.0; from  1.3 89/03/24 SMI
+ * $DragonFly: src/lib/librpcsvc/rwall.c,v 1.3 2007/11/25 14:33:02 swildner Exp $
  */
 
 /*
@@ -41,9 +42,7 @@
 #include <rpcsvc/rwall.h>
 
 int
-rwall(host, msg)
-	char *host;
-	char *msg;
+rwall(char *host, char *msg)
 {
 	return (callrpc(host, WALLPROG, WALLVERS, WALLPROC_WALL,
 			xdr_wrapstring, (char *) &msg,
diff --git a/lib/librpcsvc/secretkey.c b/lib/librpcsvc/secretkey.c
index a25751fba3..ec92009f88 100644
--- a/lib/librpcsvc/secretkey.c
+++ b/lib/librpcsvc/secretkey.c
@@ -28,7 +28,7 @@
  * Mountain View, California  94043
  *
  * @(#)secretkey.c 1.8 91/03/11 Copyr 1986 Sun Micro
- * $DragonFly: src/lib/librpcsvc/secretkey.c,v 1.4 2003/11/12 20:21:31 eirikn Exp $
+ * $DragonFly: src/lib/librpcsvc/secretkey.c,v 1.5 2007/11/25 14:33:02 swildner Exp $
  */
 
 /*
@@ -54,10 +54,7 @@ extern int xdecrypt ( char *, char * );
  * passwd to decrypt it.
  */
 int
-getsecretkey(netname, secretkey, passwd)
-	char *netname;
-	char *secretkey;
-	char *passwd;
+getsecretkey(char *netname, char *secretkey, char *passwd)
 {
 	char lookup[3 * HEXKEYBYTES];
 	char *p;
diff --git a/lib/librpcsvc/xcrypt.c b/lib/librpcsvc/xcrypt.c
index c156b4e5e4..ebe540c84d 100644
--- a/lib/librpcsvc/xcrypt.c
+++ b/lib/librpcsvc/xcrypt.c
@@ -28,7 +28,7 @@
  *
  * @(#)xcrypt.c	2.2 88/08/10 4.0 RPCSRC
  * $FreeBSD: src/lib/librpcsvc/xcrypt.c,v 1.2 1999/08/28 00:05:24 peter Exp $
- * $DragonFly: src/lib/librpcsvc/xcrypt.c,v 1.3 2003/11/12 20:21:31 eirikn Exp $
+ * $DragonFly: src/lib/librpcsvc/xcrypt.c,v 1.4 2007/11/25 14:33:02 swildner Exp $
  */
 /*
  * Hex encryption/decryption and utility routines
@@ -54,9 +54,7 @@ void passwd2des ( char *, char * );
  * Its length must be a multiple of 16 hex digits (64 bits).
  */
 int
-xencrypt(secret, passwd)
-	char *secret;
-	char *passwd;
+xencrypt(char *secret, char *passwd)
 {
 	char key[8];
 	char ivec[8];
@@ -87,9 +85,7 @@ xencrypt(secret, passwd)
  * Once again, the length is a multiple of 16 hex digits
  */
 int
-xdecrypt(secret, passwd)
-	char *secret;
-	char *passwd;
+xdecrypt(char *secret, char *passwd)
 {
 	char key[8];
 	char ivec[8];
@@ -119,9 +115,7 @@ xdecrypt(secret, passwd)
  * Turn password into DES key
  */
 void
-passwd2des(pw, key)
-	char *pw;
-	char *key;
+passwd2des(char *pw, char *key)
 {
 	int i;
 
@@ -138,10 +132,7 @@ passwd2des(pw, key)
  * Hex to binary conversion
  */
 static void
-hex2bin(len, hexnum, binnum)
-	int len;
-	char *hexnum;
-	char *binnum;
+hex2bin(int len, char *hexnum, char *binnum)
 {
 	int i;
 
@@ -154,10 +145,7 @@ hex2bin(len, hexnum, binnum)
  * Binary to hex conversion
  */
 static void
-bin2hex(len, binnum, hexnum)
-	int len;
-	unsigned char *binnum;
-	char *hexnum;
+bin2hex(int len, unsigned char *binnum, char *hexnum)
 {
 	int i;
 	unsigned val;
@@ -176,8 +164,7 @@ static char hex[16] = {
 };
 
 static char
-hexval(c)
-	char c;
+hexval(char c)
 {
 	if (c >= '0' && c <= '9') {
 		return (c - '0');
diff --git a/lib/librpcsvc/yp_passwd.c b/lib/librpcsvc/yp_passwd.c
index 8d6d608c19..c20f201ea8 100644
--- a/lib/librpcsvc/yp_passwd.c
+++ b/lib/librpcsvc/yp_passwd.c
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/lib/librpcsvc/yp_passwd.c,v 1.2 1999/08/28 00:05:24 peter Exp $
- * $DragonFly: src/lib/librpcsvc/yp_passwd.c,v 1.2 2003/06/17 04:26:51 dillon Exp $
+ * $DragonFly: src/lib/librpcsvc/yp_passwd.c,v 1.3 2007/11/25 14:33:02 swildner Exp $
  */
 
 #include <stdlib.h>
@@ -54,9 +54,7 @@ static const char rcsid[] = "$FreeBSD: src/lib/librpcsvc/yp_passwd.c,v 1.2 1999/
  * fooling gcc.
  */
 
-int _yppasswd(oldpass, newpw)
-	char *oldpass;
-	struct x_passwd *newpw;
+int _yppasswd(char *oldpass, struct x_passwd *newpw)
 {
 	char *server;
 	char *domain;
@@ -81,7 +79,8 @@ int _yppasswd(oldpass, newpw)
 	}
 
 	rval = callrpc(server, YPPASSWDPROG, YPPASSWDVERS, YPPASSWDPROC_UPDATE,
-		       xdr_yppasswd, (char *)&yppasswd, xdr_int, &result);
+		       xdr_yppasswd, (char *)&yppasswd, xdr_int,
+		       (char *)&result);
 
 	free(server);
 	if (rval || result)
diff --git a/lib/librpcsvc/yp_update.c b/lib/librpcsvc/yp_update.c
index b58b767b85..5817bcf7e4 100644
--- a/lib/librpcsvc/yp_update.c
+++ b/lib/librpcsvc/yp_update.c
@@ -36,7 +36,7 @@
  * Columbia University, New York City
  *
  * $FreeBSD: src/lib/librpcsvc/yp_update.c,v 1.2.2.1 2002/02/15 00:46:54 des Exp $
- * $DragonFly: src/lib/librpcsvc/yp_update.c,v 1.2 2003/06/17 04:26:51 dillon Exp $
+ * $DragonFly: src/lib/librpcsvc/yp_update.c,v 1.3 2007/11/25 14:33:02 swildner Exp $
  *
  * $FreeBSD: src/lib/librpcsvc/yp_update.c,v 1.2.2.1 2002/02/15 00:46:54 des Exp $
  */
@@ -57,14 +57,8 @@
 #endif
 
 int
-yp_update(domain, map, ypop, key, keylen, data, datalen)
-	char		*domain;
-	char		*map;
-	unsigned int	ypop;
-	char		*key;
-	int		keylen;
-	char		*data;
-	int		datalen;
+yp_update(char *domain, char *map, unsigned int ypop, char *key, int keylen,
+	  char *data, int datalen)
 {
 	char *master;
 	int rval;
-- 
2.41.0