diff options
author | Dag-Erling Smørgrav <des@FreeBSD.org> | 2002-04-28 15:18:50 +0000 |
---|---|---|
committer | Dag-Erling Smørgrav <des@FreeBSD.org> | 2002-04-28 15:18:50 +0000 |
commit | f249dbcc7149848de00cd8f4e93fe140dfa3f219 (patch) | |
tree | d7c3c2d08e4ff1d59c15bcb1a7ee8e74f001cb1d /libexec/rpc.rwalld/rwalld.c | |
parent | 6c28b67b1e004e45f13067a61ca68a011848b065 (diff) | |
download | src-f249dbcc7149848de00cd8f4e93fe140dfa3f219.tar.gz src-f249dbcc7149848de00cd8f4e93fe140dfa3f219.zip |
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
Notes
Notes:
svn path=/head/; revision=95658
Diffstat (limited to 'libexec/rpc.rwalld/rwalld.c')
-rw-r--r-- | libexec/rpc.rwalld/rwalld.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/libexec/rpc.rwalld/rwalld.c b/libexec/rpc.rwalld/rwalld.c index 9fa71b376452..c186a4748b2b 100644 --- a/libexec/rpc.rwalld/rwalld.c +++ b/libexec/rpc.rwalld/rwalld.c @@ -101,7 +101,7 @@ main(int argc, char *argv[]) (void)pmap_unset(WALLPROG, WALLVERS); if ((s = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP)) < 0) err(1, "socket"); - bzero((char *)&sa, sizeof sa); + bzero(&sa, sizeof sa); if (bind(s, (struct sockaddr *)&sa, sizeof sa) < 0) err(1, "bind"); @@ -184,7 +184,7 @@ wallprog_1(struct svc_req *rqstp, SVCXPRT *transp) switch (rqstp->rq_proc) { case NULLPROC: - (void)svc_sendreply(transp, xdr_void, (char *)NULL); + (void)svc_sendreply(transp, (xdrproc_t)xdr_void, NULL); goto leave; case WALLPROC_WALL: @@ -197,16 +197,17 @@ wallprog_1(struct svc_req *rqstp, SVCXPRT *transp) svcerr_noproc(transp); goto leave; } - 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); goto leave; } result = (*local)(&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); } - if (!svc_freeargs(transp, xdr_argument, (caddr_t)&argument)) { + if (!svc_freeargs(transp, (xdrproc_t)xdr_argument, &argument)) { syslog(LOG_ERR, "unable to free arguments"); exit(1); } |