From e48f76df853e520cafc8b0a6237838fa12f69ea3 Mon Sep 17 00:00:00 2001 From: des Date: Sun, 28 Apr 2002 15:18:50 +0000 Subject: 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 --- include/rpc/clnt.h | 18 +++++++++--------- include/rpc/pmap_clnt.h | 4 ++-- include/rpc/svc.h | 8 ++++---- include/rpc/xdr.h | 10 +++++----- 4 files changed, 20 insertions(+), 20 deletions(-) (limited to 'include/rpc') diff --git a/include/rpc/clnt.h b/include/rpc/clnt.h index 6cb7c36..8eddf3e 100644 --- a/include/rpc/clnt.h +++ b/include/rpc/clnt.h @@ -98,8 +98,8 @@ typedef struct __rpc_client { struct clnt_ops { /* call remote procedure */ enum clnt_stat (*cl_call)(struct __rpc_client *, - rpcproc_t, xdrproc_t, caddr_t, xdrproc_t, - caddr_t, struct timeval); + rpcproc_t, xdrproc_t, void *, xdrproc_t, + void *, struct timeval); /* abort a call */ void (*cl_abort)(struct __rpc_client *); /* get specific error code */ @@ -107,12 +107,12 @@ typedef struct __rpc_client { struct rpc_err *); /* frees results */ bool_t (*cl_freeres)(struct __rpc_client *, - xdrproc_t, caddr_t); + xdrproc_t, void *); /* destroy this structure */ void (*cl_destroy)(struct __rpc_client *); /* the ioctl() of rpc */ bool_t (*cl_control)(struct __rpc_client *, u_int, - char *); + void *); } *cl_ops; void *cl_private; /* private stuff */ char *cl_netid; /* network token */ @@ -155,17 +155,17 @@ struct rpc_timers { * CLIENT *rh; * rpcproc_t proc; * xdrproc_t xargs; - * caddr_t argsp; + * void *argsp; * xdrproc_t xres; - * caddr_t resp; + * void *resp; * struct timeval timeout; */ #define CLNT_CALL(rh, proc, xargs, argsp, xres, resp, secs) \ ((*(rh)->cl_ops->cl_call)(rh, proc, xargs, \ - (caddr_t)(void *)argsp, xres, (caddr_t)(void *)resp, secs)) + argsp, xres, resp, secs)) #define clnt_call(rh, proc, xargs, argsp, xres, resp, secs) \ ((*(rh)->cl_ops->cl_call)(rh, proc, xargs, \ - (caddr_t)(void *)argsp, xres, (caddr_t)(void *)resp, secs)) + argsp, xres, resp, secs)) /* * void @@ -189,7 +189,7 @@ struct rpc_timers { * CLNT_FREERES(rh, xres, resp); * CLIENT *rh; * xdrproc_t xres; - * caddr_t resp; + * void *resp; */ #define CLNT_FREERES(rh,xres,resp) ((*(rh)->cl_ops->cl_freeres)(rh,xres,resp)) #define clnt_freeres(rh,xres,resp) ((*(rh)->cl_ops->cl_freeres)(rh,xres,resp)) diff --git a/include/rpc/pmap_clnt.h b/include/rpc/pmap_clnt.h index 1902d69..89f1614 100644 --- a/include/rpc/pmap_clnt.h +++ b/include/rpc/pmap_clnt.h @@ -76,8 +76,8 @@ extern enum clnt_stat pmap_rmtcall(struct sockaddr_in *, xdrproc_t, caddr_t, struct timeval, u_long *); extern enum clnt_stat clnt_broadcast(u_long, u_long, u_long, - xdrproc_t, char *, - xdrproc_t, char *, + xdrproc_t, void *, + xdrproc_t, void *, resultproc_t); extern u_short pmap_getport(struct sockaddr_in *, u_long, u_long, u_int); diff --git a/include/rpc/svc.h b/include/rpc/svc.h index 5647377..dc0f9ca 100644 --- a/include/rpc/svc.h +++ b/include/rpc/svc.h @@ -91,12 +91,12 @@ typedef struct __rpc_svcxprt { enum xprt_stat (*xp_stat)(struct __rpc_svcxprt *); /* get arguments */ bool_t (*xp_getargs)(struct __rpc_svcxprt *, xdrproc_t, - caddr_t); + void *); /* send reply */ bool_t (*xp_reply)(struct __rpc_svcxprt *, struct rpc_msg *); /* free mem allocated for args */ bool_t (*xp_freeargs)(struct __rpc_svcxprt *, xdrproc_t, - caddr_t); + void *); /* destroy this struct */ void (*xp_destroy)(struct __rpc_svcxprt *); } *xp_ops; @@ -147,7 +147,7 @@ struct svc_req { * SVCXPRT *xprt; * struct rpc_msg *msg; * xdrproc_t xargs; - * caddr_t argsp; + * void * argsp; */ #define SVC_RECV(xprt, msg) \ (*(xprt)->xp_ops->xp_recv)((xprt), (msg)) @@ -259,7 +259,7 @@ __END_DECLS */ __BEGIN_DECLS -extern bool_t svc_sendreply(SVCXPRT *, xdrproc_t, char *); +extern bool_t svc_sendreply(SVCXPRT *, xdrproc_t, void *); extern void svcerr_decode(SVCXPRT *); extern void svcerr_weakauth(SVCXPRT *); extern void svcerr_noproc(SVCXPRT *); diff --git a/include/rpc/xdr.h b/include/rpc/xdr.h index 0162c97..7af99ce 100644 --- a/include/rpc/xdr.h +++ b/include/rpc/xdr.h @@ -138,7 +138,7 @@ typedef bool_t (*xdrproc_t)(XDR *, void *, u_int); /* * XXX can't actually prototype it, because some take three args!!! */ -typedef bool_t (*xdrproc_t)(/* XDR *, void *, u_int */); +typedef bool_t (*xdrproc_t)(XDR *, ...); #endif /* @@ -314,7 +314,7 @@ extern bool_t xdr_quadruple(XDR *, long double *); extern bool_t xdr_reference(XDR *, char **, u_int, xdrproc_t); extern bool_t xdr_pointer(XDR *, char **, u_int, xdrproc_t); extern bool_t xdr_wrapstring(XDR *, char **); -extern void xdr_free(xdrproc_t, char *); +extern void xdr_free(xdrproc_t, void *); extern bool_t xdr_hyper(XDR *, quad_t *); extern bool_t xdr_u_hyper(XDR *, u_quad_t *); extern bool_t xdr_longlong_t(XDR *, quad_t *); @@ -347,9 +347,9 @@ extern void xdrstdio_create(XDR *, FILE *, enum xdr_op); #endif /* XDR pseudo records for tcp */ -extern void xdrrec_create(XDR *, u_int, u_int, char *, - int (*)(char *, char *, int), - int (*)(char *, char *, int)); +extern void xdrrec_create(XDR *, u_int, u_int, void *, + int (*)(void *, void *, int), + int (*)(void *, void *, int)); /* make end of xdr record */ extern bool_t xdrrec_endofrecord(XDR *, int); -- cgit v1.1