Spell void * as void * rather than caddr_t. This is complicated by the

fact that caddr_t is often misspelled as char *.

Sponsored by:	DARPA, NAI Labs

2 files changed, 30 insertions, 23 deletions

diff --git a/lib/libc/yp/xdryp.c b/lib/libc/yp/xdryp.c
index 38aa8e2..7aed6ad 100644
--- a/lib/libc/yp/xdryp.c
+++ b/lib/libc/yp/xdryp.c
@@ -69,12 +69,12 @@ xdr_ypresp_all_seq(XDR *xdrs, u_long *objp)
 	bzero(&out, sizeof out);
 	while (1) {
 		if (!xdr_ypresp_all(xdrs, &out)) {
-			xdr_free(xdr_ypresp_all, (char *)&out);
+			xdr_free((xdrproc_t)xdr_ypresp_all, &out);
 			*objp = YP_YPERR;
 			return (FALSE);
 		}
 		if (out.more == 0) {
-			xdr_free(xdr_ypresp_all, (char *)&out);
+			xdr_free((xdrproc_t)xdr_ypresp_all, &out);
 			*objp = YP_NOMORE;
 			return (TRUE);
 		}
@@ -89,7 +89,7 @@ xdr_ypresp_all_seq(XDR *xdrs, u_long *objp)
 			bcopy(out.ypresp_all_u.val.val.valdat_val, val,
 				out.ypresp_all_u.val.val.valdat_len);
 			val[out.ypresp_all_u.val.val.valdat_len] = '\0';
-			xdr_free(xdr_ypresp_all, (char *)&out);
+			xdr_free((xdrproc_t)xdr_ypresp_all, &out);
 
 			r = (*ypresp_allfn)(status,
 				key, out.ypresp_all_u.val.key.keydat_len,
@@ -102,11 +102,11 @@ xdr_ypresp_all_seq(XDR *xdrs, u_long *objp)
 				return (TRUE);
 			break;
 		case YP_NOMORE:
-			xdr_free(xdr_ypresp_all, (char *)&out);
+			xdr_free((xdrproc_t)xdr_ypresp_all, &out);
 			*objp = YP_NOMORE;
 			return (TRUE);
 		default:
-			xdr_free(xdr_ypresp_all, (char *)&out);
+			xdr_free((xdrproc_t)xdr_ypresp_all, &out);
 			*objp = status;
 			return (TRUE);
 		}
diff --git a/lib/libc/yp/yplib.c b/lib/libc/yp/yplib.c
index a9d2d13..6087f2b 100644
--- a/lib/libc/yp/yplib.c
+++ b/lib/libc/yp/yplib.c
@@ -260,7 +260,7 @@ ypmatch_cache_lookup(struct dom_binding *ypdb, char *map, keydat *key,
 }
 #endif
 
-char *
+const char *
 ypbinderr_string(int incode)
 {
 	static char err[80];
@@ -461,7 +461,8 @@ skipit:
 		tv.tv_sec = _yplib_timeout/2;
 		tv.tv_usec = 0;
 		r = clnt_call(client, YPBINDPROC_DOMAIN,
-			xdr_domainname, (char *)&dom, xdr_ypbind_resp, &ypbr, tv);
+			(xdrproc_t)xdr_domainname, &dom,
+			(xdrproc_t)xdr_ypbind_resp, &ypbr, tv);
 		if (r != RPC_SUCCESS) {
 			clnt_destroy(client);
 			ysd->dom_vers = -1;
@@ -663,7 +664,8 @@ again:
 	bzero((char *)&yprv, sizeof yprv);
 
 	r = clnt_call(ysd->dom_client, YPPROC_MATCH,
-		xdr_ypreq_key, &yprk, xdr_ypresp_val, &yprv, tv);
+		(xdrproc_t)xdr_ypreq_key, &yprk,
+		(xdrproc_t)xdr_ypresp_val, &yprv, tv);
 	if (r != RPC_SUCCESS) {
 		clnt_perror(ysd->dom_client, "yp_match: clnt_call");
 		_yp_unbind(ysd);
@@ -680,7 +682,7 @@ again:
 #endif
 	}
 
-	xdr_free(xdr_ypresp_val, (char *)&yprv);
+	xdr_free((xdrproc_t)xdr_ypresp_val, &yprv);
 	return (r);
 }
 
@@ -726,7 +728,8 @@ again:
 	bzero((char *)&yprkv, sizeof yprkv);
 
 	r = clnt_call(ysd->dom_client, YPPROC_FIRST,
-		xdr_ypreq_nokey, &yprnk, xdr_ypresp_key_val, &yprkv, tv);
+		(xdrproc_t)xdr_ypreq_nokey, &yprnk,
+		(xdrproc_t)xdr_ypresp_key_val, &yprkv, tv);
 	if (r != RPC_SUCCESS) {
 		clnt_perror(ysd->dom_client, "yp_first: clnt_call");
 		_yp_unbind(ysd);
@@ -743,7 +746,7 @@ again:
 		(*outval)[*outvallen] = '\0';
 	}
 
-	xdr_free(xdr_ypresp_key_val, (char *)&yprkv);
+	xdr_free((xdrproc_t)xdr_ypresp_key_val, &yprkv);
 	return (r);
 }
 
@@ -781,7 +784,8 @@ again:
 	bzero((char *)&yprkv, sizeof yprkv);
 
 	r = clnt_call(ysd->dom_client, YPPROC_NEXT,
-		xdr_ypreq_key, &yprk, xdr_ypresp_key_val, &yprkv, tv);
+		(xdrproc_t)xdr_ypreq_key, &yprk,
+		(xdrproc_t)xdr_ypresp_key_val, &yprkv, tv);
 	if (r != RPC_SUCCESS) {
 		clnt_perror(ysd->dom_client, "yp_next: clnt_call");
 		_yp_unbind(ysd);
@@ -798,7 +802,7 @@ again:
 		(*outval)[*outvallen] = '\0';
 	}
 
-	xdr_free(xdr_ypresp_key_val, (char *)&yprkv);
+	xdr_free((xdrproc_t)xdr_ypresp_key_val, &yprkv);
 	return (r);
 }
 
@@ -844,8 +848,8 @@ again:
 	ypresp_data = (void *)incallback->data;
 
 	if (clnt_call(clnt, YPPROC_ALL,
-		xdr_ypreq_nokey, &yprnk,
-		xdr_ypresp_all_seq, &status, tv) != RPC_SUCCESS) {
+		(xdrproc_t)xdr_ypreq_nokey, &yprnk,
+		(xdrproc_t)xdr_ypresp_all_seq, &status, tv) != RPC_SUCCESS) {
 			clnt_perror(ysd->dom_client, "yp_all: clnt_call");
 			clnt_destroy(clnt);
 			_yp_unbind(ysd);
@@ -854,7 +858,7 @@ again:
 
 	clnt_destroy(clnt);
 	savstat = status;
-	xdr_free(xdr_ypresp_all_seq, (char *)&status);	/* not really needed... */
+	xdr_free((xdrproc_t)xdr_ypresp_all_seq, &status);	/* not really needed... */
 	if (savstat != YP_NOMORE)
 		return (ypprot_err(savstat));
 	return (0);
@@ -888,7 +892,8 @@ again:
 	bzero((char *)(char *)&ypro, sizeof ypro);
 
 	r = clnt_call(ysd->dom_client, YPPROC_ORDER,
-		xdr_ypreq_nokey, &yprnk, xdr_ypresp_order, &ypro, tv);
+		(xdrproc_t)xdr_ypreq_nokey, &yprnk,
+		(xdrproc_t)xdr_ypresp_order, &ypro, tv);
 
 	/*
 	 * NIS+ in YP compat mode doesn't support the YPPROC_ORDER
@@ -908,7 +913,7 @@ again:
 		*outorder = ypro.ordernum;
 	}
 
-	xdr_free(xdr_ypresp_order, (char *)&ypro);
+	xdr_free((xdrproc_t)xdr_ypresp_order, &ypro);
 	return (r);
 }
 
@@ -939,7 +944,8 @@ again:
 	bzero((char *)&yprm, sizeof yprm);
 
 	r = clnt_call(ysd->dom_client, YPPROC_MASTER,
-		xdr_ypreq_nokey, &yprnk, xdr_ypresp_master, &yprm, tv);
+		(xdrproc_t)xdr_ypreq_nokey, &yprnk,
+		(xdrproc_t)xdr_ypresp_master, &yprm, tv);
 	if (r != RPC_SUCCESS) {
 		clnt_perror(ysd->dom_client, "yp_master: clnt_call");
 		_yp_unbind(ysd);
@@ -950,7 +956,7 @@ again:
 		*outname = (char *)strdup(yprm.peer);
 	}
 
-	xdr_free(xdr_ypresp_master, (char *)&yprm);
+	xdr_free((xdrproc_t)xdr_ypresp_master, &yprm);
 	return (r);
 }
 
@@ -977,7 +983,8 @@ again:
 	bzero((char *)&ypml, sizeof ypml);
 
 	r = clnt_call(ysd->dom_client, YPPROC_MAPLIST,
-		xdr_domainname,(char *)&indomain,xdr_ypresp_maplist,&ypml,tv);
+		(xdrproc_t)xdr_domainname, &indomain,
+		(xdrproc_t)xdr_ypresp_maplist, &ypml,tv);
 	if (r != RPC_SUCCESS) {
 		clnt_perror(ysd->dom_client, "yp_maplist: clnt_call");
 		_yp_unbind(ysd);
@@ -987,11 +994,11 @@ again:
 		*outmaplist = ypml.maps;
 	}
 
-	/* NO: xdr_free(xdr_ypresp_maplist, &ypml);*/
+	/* NO: xdr_free((xdrproc_t)xdr_ypresp_maplist, &ypml);*/
 	return (r);
 }
 
-char *
+const char *
 yperr_string(int incode)
 {
 	static char err[80];