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

10 files changed, 105 insertions, 101 deletions

diff --git a/usr.sbin/keyserv/keyserv.c b/usr.sbin/keyserv/keyserv.c
index 55c54671442b..797549a281ee 100644
--- a/usr.sbin/keyserv/keyserv.c
+++ b/usr.sbin/keyserv/keyserv.c
@@ -633,83 +633,83 @@ keyprogram(rqstp, transp)
 		netobj  key_get_conv_2_arg;
 	} argument;
 	char *result;
-	bool_t(*xdr_argument)(), (*xdr_result)();
+	xdrproc_t xdr_argument, xdr_result;
 	char *(*local) ();
 	uid_t uid = -1;
 	int check_auth;
 
 	switch (rqstp->rq_proc) {
 	case NULLPROC:
-		svc_sendreply(transp, xdr_void, (char *)NULL);
+		svc_sendreply(transp, (xdrproc_t)xdr_void, NULL);
 		return;
 
 	case KEY_SET:
-		xdr_argument = xdr_keybuf;
-		xdr_result = xdr_int;
+		xdr_argument = (xdrproc_t)xdr_keybuf;
+		xdr_result = (xdrproc_t)xdr_int;
 		local = (char *(*)()) key_set_1_svc_prog;
 		check_auth = 1;
 		break;
 
 	case KEY_ENCRYPT:
-		xdr_argument = xdr_cryptkeyarg;
-		xdr_result = xdr_cryptkeyres;
+		xdr_argument = (xdrproc_t)xdr_cryptkeyarg;
+		xdr_result = (xdrproc_t)xdr_cryptkeyres;
 		local = (char *(*)()) key_encrypt_1_svc_prog;
 		check_auth = 1;
 		break;
 
 	case KEY_DECRYPT:
-		xdr_argument = xdr_cryptkeyarg;
-		xdr_result = xdr_cryptkeyres;
+		xdr_argument = (xdrproc_t)xdr_cryptkeyarg;
+		xdr_result = (xdrproc_t)xdr_cryptkeyres;
 		local = (char *(*)()) key_decrypt_1_svc_prog;
 		check_auth = 1;
 		break;
 
 	case KEY_GEN:
-		xdr_argument = xdr_void;
-		xdr_result = xdr_des_block;
+		xdr_argument = (xdrproc_t)xdr_void;
+		xdr_result = (xdrproc_t)xdr_des_block;
 		local = (char *(*)()) key_gen_1_svc_prog;
 		check_auth = 0;
 		break;
 
 	case KEY_GETCRED:
-		xdr_argument = xdr_netnamestr;
-		xdr_result = xdr_getcredres;
+		xdr_argument = (xdrproc_t)xdr_netnamestr;
+		xdr_result = (xdrproc_t)xdr_getcredres;
 		local = (char *(*)()) key_getcred_1_svc_prog;
 		check_auth = 0;
 		break;
 
 	case KEY_ENCRYPT_PK:
-		xdr_argument = xdr_cryptkeyarg2;
-		xdr_result = xdr_cryptkeyres;
+		xdr_argument = (xdrproc_t)xdr_cryptkeyarg2;
+		xdr_result = (xdrproc_t)xdr_cryptkeyres;
 		local = (char *(*)()) key_encrypt_pk_2_svc_prog;
 		check_auth = 1;
 		break;
 
 	case KEY_DECRYPT_PK:
-		xdr_argument = xdr_cryptkeyarg2;
-		xdr_result = xdr_cryptkeyres;
+		xdr_argument = (xdrproc_t)xdr_cryptkeyarg2;
+		xdr_result = (xdrproc_t)xdr_cryptkeyres;
 		local = (char *(*)()) key_decrypt_pk_2_svc_prog;
 		check_auth = 1;
 		break;
 
 
 	case KEY_NET_PUT:
-		xdr_argument = xdr_key_netstarg;
-		xdr_result = xdr_keystatus;
+		xdr_argument = (xdrproc_t)xdr_key_netstarg;
+		xdr_result = (xdrproc_t)xdr_keystatus;
 		local = (char *(*)()) key_net_put_2_svc_prog;
 		check_auth = 1;
 		break;
 
 	case KEY_NET_GET:
 		xdr_argument = (xdrproc_t) xdr_void;
-		xdr_result = xdr_key_netstres;
+		xdr_result = (xdrproc_t)xdr_key_netstres;
 		local = (char *(*)()) key_net_get_2_svc_prog;
 		check_auth = 1;
 		break;
 
 	case KEY_GET_CONV:
 		xdr_argument = (xdrproc_t) xdr_keybuf;
-		xdr_result = xdr_cryptkeyres;
+		xdr_result = (xdrproc_t)xdr_cryptkeyres;
 		local = (char *(*)()) key_get_conv_2_svc_prog;
 		check_auth = 1;
 		break;
@@ -738,18 +738,18 @@ keyprogram(rqstp, transp)
 		uid = ((struct authsys_parms *)rqstp->rq_clntcred)->aup_uid;
 	}
 
-	memset((char *) &argument, 0, sizeof (argument));
-	if (!svc_getargs(transp, xdr_argument, (caddr_t)&argument)) {
+	memset(&argument, 0, sizeof (argument));
+	if (!svc_getargs(transp, xdr_argument, &argument)) {
 		svcerr_decode(transp);
 		return;
 	}
 	result = (*local) (uid, &argument);
-	if (!svc_sendreply(transp, xdr_result, (char *) result)) {
+	if (!svc_sendreply(transp, xdr_result, result)) {
 		if (debugging)
 			(void) fprintf(stderr, "unable to reply\n");
 		svcerr_systemerr(transp);
 	}
-	if (!svc_freeargs(transp, xdr_argument, (caddr_t)&argument)) {
+	if (!svc_freeargs(transp, xdr_argument, &argument)) {
 		if (debugging)
 			(void) fprintf(stderr,
 			"unable to free arguments\n");
diff --git a/usr.sbin/rpc.ypxfrd/ypxfrd_server.c b/usr.sbin/rpc.ypxfrd/ypxfrd_server.c
index f1b6ba1115cb..3b53004076e8 100644
--- a/usr.sbin/rpc.ypxfrd/ypxfrd_server.c
+++ b/usr.sbin/rpc.ypxfrd/ypxfrd_server.c
@@ -103,7 +103,7 @@ ypxfrd_getmap_1_svc(ypxfr_mapname *argp, struct svc_req *rqstp)
 
 	snprintf (buf, sizeof(buf), "%s/%s/%s", yp_dir, argp->xfrdomain,
 							argp->xfrmap);
-	if (access((char *)&buf, R_OK) == -1) {
+	if (access(buf, R_OK) == -1) {
 		result.xfr_u.xfrstat = XFR_ACCESS;
 		return(&result);
 	}
@@ -132,14 +132,14 @@ ypxfrd_getmap_1_svc(ypxfr_mapname *argp, struct svc_req *rqstp)
 		forked++;
 	}
 #endif
-	if ((fp = open((char *)&buf, O_RDONLY)) == -1) {
+	if ((fp = open(buf, O_RDONLY)) == -1) {
 		result.xfr_u.xfrstat = XFR_READ_ERR;
 		return(&result);
 	}
 
 	/* Start sending the file. */
 
-	svc_sendreply(rqstp->rq_xprt, xdr_my_xfr, (char *)&result);
+	svc_sendreply(rqstp->rq_xprt, (xdrproc_t)xdr_my_xfr, &result);
 
 	close(fp);
 
diff --git a/usr.sbin/spray/spray.c b/usr.sbin/spray/spray.c
index ab98c8558b1c..39759eb3a10e 100644
--- a/usr.sbin/spray/spray.c
+++ b/usr.sbin/spray/spray.c
@@ -133,11 +133,12 @@ main(int argc, char *argv[])
 	 * The following (undocumented) hack resets the internal state
 	 * of the client handle.
 	 */
-	clnt_control(cl, CLSET_TIMEOUT, (caddr_t)&NO_DEFAULT);
+	clnt_control(cl, CLSET_TIMEOUT, &NO_DEFAULT);
 
 
 	/* Clear server statistics */
-	if (clnt_call(cl, SPRAYPROC_CLEAR, xdr_void, NULL, xdr_void, NULL, TIMEOUT) != RPC_SUCCESS)
+	if (clnt_call(cl, SPRAYPROC_CLEAR, (xdrproc_t)xdr_void, NULL,
+		(xdrproc_t)xdr_void, NULL, TIMEOUT) != RPC_SUCCESS)
 		errx(1, "%s", clnt_sperror(cl, NULL));
 
 
@@ -147,7 +148,8 @@ main(int argc, char *argv[])
 	fflush (stdout);
 
 	for (i = 0; i < count; i++) {
-		clnt_call(cl, SPRAYPROC_SPRAY, xdr_sprayarr, &host_array, xdr_void, NULL, ONE_WAY);
+		clnt_call(cl, SPRAYPROC_SPRAY, (xdrproc_t)xdr_sprayarr,
+		    &host_array, (xdrproc_t)xdr_void, NULL, ONE_WAY);
 
 		if (delay) {
 			usleep(delay);
@@ -156,7 +158,8 @@ main(int argc, char *argv[])
 
 
 	/* Collect statistics from server */
-	if (clnt_call(cl, SPRAYPROC_GET, xdr_void, NULL, xdr_spraycumul, &host_stats, TIMEOUT) != RPC_SUCCESS)
+	if (clnt_call(cl, SPRAYPROC_GET, (xdrproc_t)xdr_void, NULL,
+		(xdrproc_t)xdr_spraycumul, &host_stats, TIMEOUT) != RPC_SUCCESS)
 		errx(1, "%s", clnt_sperror(cl, NULL));
 
 	xmit_time = host_stats.clock.sec +
diff --git a/usr.sbin/yp_mkdb/yp_mkdb.c b/usr.sbin/yp_mkdb/yp_mkdb.c
index e37cf35f3db5..611218ed4229 100644
--- a/usr.sbin/yp_mkdb/yp_mkdb.c
+++ b/usr.sbin/yp_mkdb/yp_mkdb.c
@@ -332,9 +332,9 @@ doclear:
 		char in = 0;
 		char *out = NULL;
 		int stat;
-		if ((stat = callrpc("localhost",YPPROG,YPVERS,YPPROC_CLEAR,
-			xdr_void, (void *)&in,
-			xdr_void, (void *)out)) != RPC_SUCCESS) {
+		if ((stat = callrpc("localhost", YPPROG,YPVERS, YPPROC_CLEAR,
+			(xdrproc_t)xdr_void, &in,
+			(xdrproc_t)xdr_void, out)) != RPC_SUCCESS) {
 			warnx("failed to send 'clear' to local ypserv: %s",
 				clnt_sperrno((enum clnt_stat) stat));
 		}
diff --git a/usr.sbin/ypbind/yp_ping.c b/usr.sbin/ypbind/yp_ping.c
index 9252a7462478..9e77d16fc468 100644
--- a/usr.sbin/ypbind/yp_ping.c
+++ b/usr.sbin/ypbind/yp_ping.c
@@ -147,8 +147,10 @@ __pmap_getport(struct sockaddr_in *address, u_long program, u_long version,
 		parms.pm_vers = version;
 		parms.pm_prot = protocol;
 		parms.pm_port = 0;  /* not needed or used */
-		if (CLNT_CALL(client, PMAPPROC_GETPORT, xdr_pmap, &parms,
-		    xdr_u_short, &port, tottimeout) != RPC_SUCCESS){
+		if (CLNT_CALL(client, PMAPPROC_GETPORT,
+			(xdrproc_t)xdr_pmap, &parms,
+			(xdrproc_t)xdr_u_short, &port,
+			tottimeout) != RPC_SUCCESS){
 			rpc_createerr.cf_stat = RPC_PMAPFAILURE;
 			clnt_geterr(client, &rpc_createerr.cf_error);
 		} else if (port == 0) {
diff --git a/usr.sbin/ypbind/ypbind.c b/usr.sbin/ypbind/ypbind.c
index 8b85e9532ab0..3000e7ff285b 100644
--- a/usr.sbin/ypbind/ypbind.c
+++ b/usr.sbin/ypbind/ypbind.c
@@ -160,8 +160,8 @@ ypbindproc_null_2_yp(SVCXPRT *transp, void *argp, CLIENT *clnt)
 {
 	static char res;
 
-	bzero((char *)&res, sizeof(res));
-	return (void *)&res;
+	bzero(&res, sizeof(res));
+	return &res;
 }
 
 struct ypbind_resp *
@@ -171,7 +171,7 @@ ypbindproc_domain_2_yp(SVCXPRT *transp, domainname *argp, CLIENT *clnt)
 	struct _dom_binding *ypdb;
 	char path[MAXPATHLEN];
 
-	bzero((char *)&res, sizeof res);
+	bzero(&res, sizeof res);
 	res.ypbind_status = YPBIND_FAIL_VAL;
 	res.ypbind_resp_u.ypbind_error = YPBIND_ERR_NOSERV;
 
@@ -204,7 +204,7 @@ rejecting.", *argp);
 			res.ypbind_resp_u.ypbind_error = YPBIND_ERR_RESC;
 			return (&res);
 		}
-		bzero((char *)ypdb, sizeof *ypdb);
+		bzero(ypdb, sizeof *ypdb);
 		strncpy(ypdb->dom_domain, *argp, sizeof ypdb->dom_domain);
 		ypdb->dom_vers = YPVERS;
 		ypdb->dom_alive = 0;
@@ -272,7 +272,7 @@ rejecting.", argp->ypsetdom_domain);
 		return(NULL);
 	}
 
-	bzero((char *)&bindsin, sizeof bindsin);
+	bzero(&bindsin, sizeof bindsin);
 	bindsin.sin_family = AF_INET;
 	bindsin.sin_addr.s_addr = *(u_int32_t *)argp->ypsetdom_binding.ypbind_binding_addr;
 	bindsin.sin_port = *(u_short *)argp->ypsetdom_binding.ypbind_binding_port;
@@ -281,7 +281,7 @@ rejecting.", argp->ypsetdom_domain);
 	return((void *) &result);
 }
 
-static void
+void
 ypbindprog_2(struct svc_req *rqstp, register SVCXPRT *transp)
 {
 	union {
@@ -329,13 +329,14 @@ ypbindprog_2(struct svc_req *rqstp, register SVCXPRT *transp)
 		svcerr_noproc(transp);
 		return;
 	}
-	bzero((char *)&argument, sizeof(argument));
-	if (!svc_getargs(transp, xdr_argument, (caddr_t)&argument)) {
+	bzero(&argument, sizeof(argument));
+	if (!svc_getargs(transp, (xdrproc_t)xdr_argument, &argument)) {
 		svcerr_decode(transp);
 		return;
 	}
 	result = (*local)(transp, &argument, rqstp);
-	if (result != NULL && !svc_sendreply(transp, xdr_result, result)) {
+	if (result != NULL &&
+	    !svc_sendreply(transp, (xdrproc_t)xdr_result, result)) {
 		svcerr_systemerr(transp);
 	}
 	return;
@@ -449,7 +450,7 @@ main(int argc, char *argv[])
 	ypbindlist = (struct _dom_binding *)malloc(sizeof *ypbindlist);
 	if (ypbindlist == NULL)
 		errx(1, "malloc");
-	bzero((char *)ypbindlist, sizeof *ypbindlist);
+	bzero(ypbindlist, sizeof *ypbindlist);
 	strncpy(ypbindlist->dom_domain, domain_name, sizeof ypbindlist->dom_domain);
 	ypbindlist->dom_vers = YPVERS;
 	ypbindlist->dom_alive = 0;
@@ -540,7 +541,7 @@ handle_children(struct _dom_binding *ypdb)
 	FD_CLR(READFD, &svc_fdset);
 	READFD = WRITEFD = -1;
 	if (d > 0 && a > 0)
-		rpc_received((char *)&buf, &addr, 0);
+		rpc_received(buf, &addr, 0);
 	else {
 		for (y = ypbindlist; y; y = y->dom_pnext) {
 			if (y == ypdb)
@@ -615,7 +616,7 @@ bool_t *out;
 struct sockaddr_in *addr;
 {
 	if (retries >= MAX_RETRIES) {
-		bzero((char *)addr, sizeof(struct sockaddr_in));
+		bzero(addr, sizeof(struct sockaddr_in));
 		if (tell_parent(broad_domain->dom_domain, addr))
 			syslog(LOG_WARNING, "lost connection to parent");
 		return (TRUE);
@@ -704,15 +705,15 @@ broadcast(struct _dom_binding *ypdb)
 		i = __yp_ping(restricted_addrs, yp_restricted,
 				ypdb->dom_domain, &port);
 		if (i == -1) {
-			bzero((char *)&ypdb->dom_server_addr,
-						sizeof(struct sockaddr_in));
+			bzero(&ypdb->dom_server_addr,
+			    sizeof(struct sockaddr_in));
 			if (tell_parent(ypdb->dom_domain,
-					&ypdb->dom_server_addr))
+				&ypdb->dom_server_addr))
 			syslog(LOG_WARNING, "lost connection to parent");
 		} else {
-			bzero((char *)&sin, sizeof(struct sockaddr_in));
-			bcopy((char *)&restricted_addrs[i],
-				(char *)&sin.sin_addr, sizeof(struct in_addr));
+			bzero(&sin, sizeof(struct sockaddr_in));
+			bcopy(&restricted_addrs[i],
+			    &sin.sin_addr, sizeof(struct in_addr));
 			sin.sin_family = AF_INET;
 			sin.sin_port = port;
 			if (tell_parent(broad_domain->dom_domain, &sin))
@@ -727,15 +728,16 @@ broadcast(struct _dom_binding *ypdb)
 	{
 		char *ptr;
 
-		ptr = (char *)&ypdb->dom_domain;
+		ptr = ypdb->dom_domain;
 		stat = clnt_broadcast(YPPROG, YPVERS, YPPROC_DOMAIN_NONACK,
-	    		xdr_domainname, (char *)&ptr, xdr_bool, (char *)&out,
+	    		(xdrproc_t)xdr_domainname, &ptr,
+		        (xdrproc_t)xdr_bool, &out,
 	    		(resultproc_t)broadcast_result);
 	}
 
 	if (stat != RPC_SUCCESS) {
-		bzero((char *)&ypdb->dom_server_addr,
-						sizeof(struct sockaddr_in));
+		bzero(&ypdb->dom_server_addr,
+		    sizeof(struct sockaddr_in));
 		if (tell_parent(ypdb->dom_domain, &ypdb->dom_server_addr))
 			syslog(LOG_WARNING, "lost connection to parent");
 	}
@@ -785,11 +787,12 @@ ping(struct _dom_binding *ypdb)
 	{
 		char *ptr;
 
-		ptr = (char *)&ypdb->dom_domain;
+		ptr = ypdb->dom_domain;
 
-		if ((stat = clnt_call(client_handle, YPPROC_DOMAIN,
-			xdr_domainname, (char *)&ptr, xdr_bool, (char *)&out,
-			timeout)) != RPC_SUCCESS || out == FALSE) {
+		stat = clnt_call(client_handle, YPPROC_DOMAIN,
+		    (xdrproc_t)xdr_domainname, &ptr,
+		    (xdrproc_t)xdr_bool, &out, timeout);
+		if (stat != RPC_SUCCESS || out == FALSE) {
 			ypdb->dom_alive = 0;
 			ypdb->dom_vers = -1;
 			clnt_destroy(client_handle);
@@ -877,7 +880,7 @@ rpc_received(char *dom, struct sockaddr_in *raddrp, int force)
 			syslog(LOG_WARNING, "malloc: %m");
 			return;
 		}
-		bzero((char *)ypdb, sizeof *ypdb);
+		bzero(ypdb, sizeof *ypdb);
 		strncpy(ypdb->dom_domain, dom, sizeof ypdb->dom_domain);
 		ypdb->dom_lockfd = -1;
 		ypdb->dom_default = 0;
@@ -890,7 +893,7 @@ rpc_received(char *dom, struct sockaddr_in *raddrp, int force)
 		syslog(LOG_WARNING, "NIS server [%s] for domain \"%s\" OK",
 		inet_ntoa(raddrp->sin_addr), ypdb->dom_domain);
 
-	bcopy((char *)raddrp, (char *)&ypdb->dom_server_addr,
+	bcopy(raddrp, &ypdb->dom_server_addr,
 		sizeof ypdb->dom_server_addr);
 
 	ypdb->dom_vers = YPVERS;
@@ -923,9 +926,9 @@ rpc_received(char *dom, struct sockaddr_in *raddrp, int force)
 	 */
 	ypdb->dom_lockfd = fd;
 
-	iov[0].iov_base = (caddr_t)&(udptransp->xp_port);
+	iov[0].iov_base = (char *)&(udptransp->xp_port);
 	iov[0].iov_len = sizeof udptransp->xp_port;
-	iov[1].iov_base = (caddr_t)&ybr;
+	iov[1].iov_base = (char *)&ybr;
 	iov[1].iov_len = sizeof ybr;
 
 	bzero(&ybr, sizeof ybr);
@@ -951,8 +954,7 @@ verify(struct in_addr addr)
 	int i;
 
 	for (i = 0; i < RESTRICTED_SERVERS; i++)
-		if (!bcmp((char *)&addr, (char *)&restricted_addrs[i],
-			sizeof(struct in_addr)))
+		if (!bcmp(&addr, &restricted_addrs[i], sizeof(struct in_addr)))
 			return(0);
 
 	return(1);
@@ -978,9 +980,9 @@ yp_restricted_mode(char *args)
 	while ((s = strsep(&args, ",")) != NULL && i < RESTRICTED_SERVERS) {
 		if ((h = gethostbyname(s)) == NULL)
 			return;
-		bcopy ((char *)h->h_addr_list[0], (char *)&restricted_addrs[i],
-			sizeof(struct in_addr));
-	i++;
+		bcopy (h->h_addr_list[0], &restricted_addrs[i],
+		    sizeof(struct in_addr));
+		i++;
 	}
 
 	/* ypset and ypsetme not allowed with restricted mode */
diff --git a/usr.sbin/yppush/yppush_main.c b/usr.sbin/yppush/yppush_main.c
index 2e92f1622fa2..a0e1ddb46d7a 100644
--- a/usr.sbin/yppush/yppush_main.c
+++ b/usr.sbin/yppush/yppush_main.c
@@ -508,7 +508,7 @@ yppush_foreach(int status, char *key, int keylen, char *val, int vallen,
 	}
 
 	/* Cleared for takeoff: set everything in motion. */
-	if (yp_push(&server, yppush_mapname, yppush_transid))
+	if (yp_push(server, yppush_mapname, yppush_transid))
 		return(yp_errno);
 
 	/* Bump the job counter and transaction ID. */
diff --git a/usr.sbin/ypserv/yp_dblookup.c b/usr.sbin/ypserv/yp_dblookup.c
index 23ab2a288bc2..d0a3b1d9e844 100644
--- a/usr.sbin/ypserv/yp_dblookup.c
+++ b/usr.sbin/ypserv/yp_dblookup.c
@@ -318,7 +318,7 @@ yp_cache_db(DB *dbp, char *name, int size)
  *   the same database comes in later.
  */
 static DB *
-yp_find_db(char *name, char *key, int size)
+yp_find_db(const char *name, const char *key, int size)
 {
 	register struct circleq_entry *qptr;
 
@@ -364,11 +364,11 @@ yp_open_db_cache(const char *domain, const char *map, const char *key,
 	strcat(buf, "/");
 	strcat(buf, map);
 
-	if ((dbp = yp_find_db((char *)&buf, key, size)) != NULL) {
+	if ((dbp = yp_find_db(buf, key, size)) != NULL) {
 		return(dbp);
 	} else {
 		if ((dbp = yp_open_db(domain, map)) != NULL) {
-			if (yp_cache_db(dbp, (char *)&buf, size)) {
+			if (yp_cache_db(dbp, buf, size)) {
 				(void)(dbp->close)(dbp);
 				yp_errno = YP_YPERR;
 				return(NULL);
@@ -506,8 +506,8 @@ yp_get_record(const char *domain, const char *map,
 		TAILQ_FIRST(&qhead)->dbptr->size = 0;
 	}
 #else
-	bcopy((char *)data->data, (char *)&buf, data->size);
-	data->data = (void *)&buf;
+	bcopy(data->data, &buf, data->size);
+	data->data = &buf;
 	(void)(dbp->close)(dbp);
 #endif
 
@@ -558,8 +558,8 @@ yp_first_record(const DB *dbp, DBT *key, DBT *data, int allow)
 		TAILQ_FIRST(&qhead)->dbptr->size = key->size;
 	}
 #else
-	bcopy((char *)data->data, (char *)&buf, data->size);
-	data->data = (void *)&buf;
+	bcopy(data->data, &buf, data->size);
+	data->data = &buf;
 #endif
 
 	return(YP_TRUE);
@@ -599,7 +599,7 @@ yp_next_record(const DB *dbp, DBT *key, DBT *data, int all, int allow)
 #endif
 			(dbp->seq)(dbp,&lkey,&ldata,R_FIRST);
 			while (key->size != lkey.size ||
-			    strncmp((char *)key->data, lkey.data,
+			    strncmp(key->data, lkey.data,
 			    (int)key->size))
 				if ((dbp->seq)(dbp,&lkey,&ldata,R_NEXT)) {
 #ifdef DB_CACHE
@@ -639,11 +639,11 @@ yp_next_record(const DB *dbp, DBT *key, DBT *data, int all, int allow)
 		TAILQ_FIRST(&qhead)->dbptr->size = key->size;
 	}
 #else
-	bcopy((char *)key->data, (char *)&keybuf, key->size);
-	lkey.data = (void *)&keybuf;
+	bcopy(key->data, &keybuf, key->size);
+	lkey.data = &keybuf;
 	lkey.size = key->size;
-	bcopy((char *)data->data, (char *)&datbuf, data->size);
-	data->data = (void *)&datbuf;
+	bcopy(data->data, &datbuf, data->size);
+	data->data = &datbuf;
 #endif
 
 	return(YP_TRUE);
diff --git a/usr.sbin/ypserv/yp_server.c b/usr.sbin/ypserv/yp_server.c
index 80d9da99288f..5ab462831999 100644
--- a/usr.sbin/ypserv/yp_server.c
+++ b/usr.sbin/ypserv/yp_server.c
@@ -285,7 +285,7 @@ ypxfr_callback(ypxfrstat rval, struct sockaddr_in *addr, unsigned int transid,
 
 	/* Turn the timeout off -- we don't want to block. */
 	timeout.tv_sec = 0;
-	if (clnt_control(clnt, CLSET_TIMEOUT, (char *)&timeout) == FALSE)
+	if (clnt_control(clnt, CLSET_TIMEOUT, &timeout) == FALSE)
 		yp_error("failed to set timeout on ypproc_xfr callback");
 
 	if (yppushproc_xfrresp_1(&ypxfr_resp, clnt) == NULL) {
@@ -303,7 +303,7 @@ ypxfr_callback(ypxfrstat rval, struct sockaddr_in *addr, unsigned int transid,
 #define YPXFR_RETURN(CODE) 						\
 	/* Order is important: send regular RPC reply, then callback */	\
 	result.xfrstat = CODE; 						\
-	svc_sendreply(rqstp->rq_xprt, xdr_ypresp_xfr, (char *)&result); \
+	svc_sendreply(rqstp->rq_xprt, (xdrproc_t)xdr_ypresp_xfr, &result); \
 	ypxfr_callback(CODE,rqhost,argp->transid, 			\
 					argp->prog,argp->port); 	\
 	return(NULL);
@@ -378,7 +378,7 @@ ypproc_xfr_2_svc(ypreq_xfr *argp, struct svc_req *rqstp)
 			"-p", yp_dir, "-C", t,
 		      	g, inet_ntoa(rqhost->sin_addr),
 			p, argp->map_parms.map,
-		      	(char *)NULL);
+		      	NULL);
 		} else {
 			execl(ypxfr_command, "ypxfr",
 			"-d", argp->map_parms.domain,
@@ -386,7 +386,7 @@ ypproc_xfr_2_svc(ypreq_xfr *argp, struct svc_req *rqstp)
 			"-C", t,
 		      	g, inet_ntoa(rqhost->sin_addr),
 			p, argp->map_parms.map,
-		      	(char *)NULL);
+		      	NULL);
 		}
 		yp_error("ypxfr execl(%s): %s", ypxfr_command, strerror(errno));
 		YPXFR_RETURN(YPXFR_XFRERR)
@@ -550,7 +550,7 @@ ypproc_all_2_svc(ypreq_nokey *argp, struct svc_req *rqstp)
 	}
 
 	/* Kick off the actual data transfer. */
-	svc_sendreply(rqstp->rq_xprt, xdr_my_ypresp_all, (char *)&result);
+	svc_sendreply(rqstp->rq_xprt, (xdrproc_t)xdr_my_ypresp_all, &result);
 
 	/*
 	 * Proper fix for PR #10970: exit here so that we don't risk
@@ -598,10 +598,9 @@ ypproc_master_2_svc(ypreq_nokey *argp, struct svc_req *rqstp)
 	 */
 	result.stat = yp_getbykey(&key, &val);
 	if (result.stat == YP_TRUE) {
-		bcopy((char *)val.valdat_val, (char *)&ypvalbuf,
-						val.valdat_len);
+		bcopy(val.valdat_val, &ypvalbuf, val.valdat_len);
 		ypvalbuf[val.valdat_len] = '\0';
-		result.peer = (char *)&ypvalbuf;
+		result.peer = ypvalbuf;
 	} else
 		result.peer = "";
 
@@ -646,7 +645,7 @@ ypproc_order_2_svc(ypreq_nokey *argp, struct svc_req *rqstp)
 	result.stat = yp_getbykey(&key, &val);
 
 	if (result.stat == YP_TRUE)
-		result.ordernum = atoi((char *)val.valdat_val);
+		result.ordernum = atoi(val.valdat_val);
 	else
 		result.ordernum = 0;
 
@@ -698,7 +697,7 @@ yp_maplist_create(const char *domain)
 				yp_maplist_free(yp_maplist);
 				return(NULL);
 			}
-			if ((cur->map = (char *)strdup(dirp->d_name)) == NULL) {
+			if ((cur->map = strdup(dirp->d_name)) == NULL) {
 				yp_error("strdup() failed: %s",strerror(errno));
 				closedir(dird);
 				yp_maplist_free(yp_maplist);
@@ -818,8 +817,7 @@ ypoldproc_match_1_svc(yprequest *argp, struct svc_req *rqstp)
 	if (v2_result == NULL)
 		return(NULL);
 
-	bcopy((char *)v2_result,
-	      (char *)&result.ypresponse_u.yp_resp_valtype,
+	bcopy(v2_result, &result.ypresponse_u.yp_resp_valtype,
 	      sizeof(ypresp_val));
 
 	return (&result);
@@ -850,8 +848,7 @@ ypoldproc_first_1_svc(yprequest *argp, struct svc_req *rqstp)
 	if (v2_result == NULL)
 		return(NULL);
 
-	bcopy((char *)v2_result,
-	      (char *)&result.ypresponse_u.yp_resp_key_valtype,
+	bcopy(v2_result, &result.ypresponse_u.yp_resp_key_valtype,
 	      sizeof(ypresp_key_val));
 
 	return (&result);
@@ -881,8 +878,7 @@ ypoldproc_next_1_svc(yprequest *argp, struct svc_req *rqstp)
 	if (v2_result == NULL)
 		return(NULL);
 
-	bcopy((char *)v2_result,
-	      (char *)&result.ypresponse_u.yp_resp_key_valtype,
+	bcopy(v2_result, &result.ypresponse_u.yp_resp_key_valtype,
 	      sizeof(ypresp_key_val));
 
 	return (&result);
diff --git a/usr.sbin/ypset/ypset.c b/usr.sbin/ypset/ypset.c
index b75926a6c849..730a6edd29d2 100644
--- a/usr.sbin/ypset/ypset.c
+++ b/usr.sbin/ypset/ypset.c
@@ -100,7 +100,8 @@ bind_tohost(struct sockaddr_in *sin, char *dom, char *server)
 	client->cl_auth = authunix_create_default();
 
 	r = clnt_call(client, YPBINDPROC_SETDOM,
-		xdr_ypbind_setdom, &ypsd, xdr_void, NULL, tv);
+		(xdrproc_t)xdr_ypbind_setdom, &ypsd,
+		(xdrproc_t)xdr_void, NULL, tv);
 	if (r) {
 		warnx("sorry, cannot ypset for domain %s on host", dom);
 		clnt_destroy(client);