xdrproc_t casts.
This commit is contained in:
parent
fed24e89c8
commit
caaf1528bc
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: authunix_prot.c,v 1.8 1999/01/20 11:37:34 lukem Exp $ */
|
||||
/* $NetBSD: authunix_prot.c,v 1.9 1999/01/31 20:45:31 christos Exp $ */
|
||||
|
||||
/*
|
||||
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
|
||||
@ -35,7 +35,7 @@
|
||||
static char *sccsid = "@(#)authunix_prot.c 1.15 87/08/11 Copyr 1984 Sun Micro";
|
||||
static char *sccsid = "@(#)authunix_prot.c 2.1 88/07/29 4.0 RPCSRC";
|
||||
#else
|
||||
__RCSID("$NetBSD: authunix_prot.c,v 1.8 1999/01/20 11:37:34 lukem Exp $");
|
||||
__RCSID("$NetBSD: authunix_prot.c,v 1.9 1999/01/31 20:45:31 christos Exp $");
|
||||
#endif
|
||||
#endif
|
||||
|
||||
@ -71,7 +71,7 @@ xdr_authunix_parms(xdrs, p)
|
||||
&& xdr_int(xdrs, &(p->aup_uid))
|
||||
&& xdr_int(xdrs, &(p->aup_gid))
|
||||
&& xdr_array(xdrs, (caddr_t *)&(p->aup_gids),
|
||||
&(p->aup_len), NGRPS, sizeof(int), xdr_int) ) {
|
||||
&(p->aup_len), NGRPS, sizeof(int), (xdrproc_t)xdr_int) ) {
|
||||
return (TRUE);
|
||||
}
|
||||
return (FALSE);
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: clnt_tcp.c,v 1.16 1999/01/20 11:37:36 lukem Exp $ */
|
||||
/* $NetBSD: clnt_tcp.c,v 1.17 1999/01/31 20:45:31 christos Exp $ */
|
||||
|
||||
/*
|
||||
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
|
||||
@ -35,7 +35,7 @@
|
||||
static char *sccsid = "@(#)clnt_tcp.c 1.37 87/10/05 Copyr 1984 Sun Micro";
|
||||
static char *sccsid = "@(#)clnt_tcp.c 2.2 88/08/01 4.0 RPCSRC";
|
||||
#else
|
||||
__RCSID("$NetBSD: clnt_tcp.c,v 1.16 1999/01/20 11:37:36 lukem Exp $");
|
||||
__RCSID("$NetBSD: clnt_tcp.c,v 1.17 1999/01/31 20:45:31 christos Exp $");
|
||||
#endif
|
||||
#endif
|
||||
|
||||
@ -310,7 +310,7 @@ call_again:
|
||||
for (;;) {
|
||||
reply_msg.acpted_rply.ar_verf = _null_auth;
|
||||
reply_msg.acpted_rply.ar_results.where = NULL;
|
||||
reply_msg.acpted_rply.ar_results.proc = xdr_void;
|
||||
reply_msg.acpted_rply.ar_results.proc = (xdrproc_t)xdr_void;
|
||||
if (! xdrrec_skiprecord(xdrs))
|
||||
return (ct->ct_error.re_status);
|
||||
/* now decode and validate the response header */
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: pmap_clnt.c,v 1.10 1999/01/20 11:37:37 lukem Exp $ */
|
||||
/* $NetBSD: pmap_clnt.c,v 1.11 1999/01/31 20:45:31 christos Exp $ */
|
||||
|
||||
/*
|
||||
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
|
||||
@ -35,7 +35,7 @@
|
||||
static char *sccsid = "@(#)pmap_clnt.c 1.37 87/08/11 Copyr 1984 Sun Micro";
|
||||
static char *sccsid = "@(#)pmap_clnt.c 2.2 88/08/01 4.0 RPCSRC";
|
||||
#else
|
||||
__RCSID("$NetBSD: pmap_clnt.c,v 1.10 1999/01/20 11:37:37 lukem Exp $");
|
||||
__RCSID("$NetBSD: pmap_clnt.c,v 1.11 1999/01/31 20:45:31 christos Exp $");
|
||||
#endif
|
||||
#endif
|
||||
|
||||
@ -89,8 +89,8 @@ pmap_set(program, version, protocol, port)
|
||||
parms.pm_vers = version;
|
||||
parms.pm_prot = protocol;
|
||||
parms.pm_port = port;
|
||||
if (CLNT_CALL(client, PMAPPROC_SET, xdr_pmap, &parms, xdr_bool, &rslt,
|
||||
tottimeout) != RPC_SUCCESS) {
|
||||
if (CLNT_CALL(client, PMAPPROC_SET, (xdrproc_t)xdr_pmap,
|
||||
&parms, (xdrproc_t)xdr_bool, &rslt, tottimeout) != RPC_SUCCESS) {
|
||||
clnt_perror(client, "Cannot register service");
|
||||
if (socket != -1)
|
||||
(void)close(socket);
|
||||
@ -126,8 +126,8 @@ pmap_unset(program, version)
|
||||
parms.pm_prog = program;
|
||||
parms.pm_vers = version;
|
||||
parms.pm_port = parms.pm_prot = 0;
|
||||
CLNT_CALL(client, PMAPPROC_UNSET, xdr_pmap, &parms, xdr_bool, &rslt,
|
||||
tottimeout);
|
||||
CLNT_CALL(client, PMAPPROC_UNSET, (xdrproc_t)xdr_pmap, &parms,
|
||||
(xdrproc_t)xdr_bool, &rslt, tottimeout);
|
||||
CLNT_DESTROY(client);
|
||||
if (socket != -1)
|
||||
(void)close(socket);
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: pmap_getmaps.c,v 1.10 1999/01/20 11:37:37 lukem Exp $ */
|
||||
/* $NetBSD: pmap_getmaps.c,v 1.11 1999/01/31 20:45:31 christos Exp $ */
|
||||
|
||||
/*
|
||||
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
|
||||
@ -35,7 +35,7 @@
|
||||
static char *sccsid = "@(#)pmap_getmaps.c 1.10 87/08/11 Copyr 1984 Sun Micro";
|
||||
static char *sccsid = "@(#)pmap_getmaps.c 2.2 88/08/01 4.0 RPCSRC";
|
||||
#else
|
||||
__RCSID("$NetBSD: pmap_getmaps.c,v 1.10 1999/01/20 11:37:37 lukem Exp $");
|
||||
__RCSID("$NetBSD: pmap_getmaps.c,v 1.11 1999/01/31 20:45:31 christos Exp $");
|
||||
#endif
|
||||
#endif
|
||||
|
||||
@ -90,8 +90,9 @@ pmap_getmaps(address)
|
||||
client = clnttcp_create(address, PMAPPROG,
|
||||
PMAPVERS, &sock, 50, 500);
|
||||
if (client != (CLIENT *)NULL) {
|
||||
if (CLNT_CALL(client, PMAPPROC_DUMP, xdr_void, NULL,
|
||||
xdr_pmaplist, &head, minutetimeout) != RPC_SUCCESS) {
|
||||
if (CLNT_CALL(client, PMAPPROC_DUMP, (xdrproc_t)xdr_void, NULL,
|
||||
(xdrproc_t)xdr_pmaplist, &head, minutetimeout) !=
|
||||
RPC_SUCCESS) {
|
||||
clnt_perror(client, "pmap_getmaps rpc problem");
|
||||
}
|
||||
CLNT_DESTROY(client);
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: pmap_getport.c,v 1.10 1999/01/20 11:37:37 lukem Exp $ */
|
||||
/* $NetBSD: pmap_getport.c,v 1.11 1999/01/31 20:45:31 christos Exp $ */
|
||||
|
||||
/*
|
||||
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
|
||||
@ -35,7 +35,7 @@
|
||||
static char *sccsid = "@(#)pmap_getport.c 1.9 87/08/11 Copyr 1984 Sun Micro";
|
||||
static char *sccsid = "@(#)pmap_getport.c 2.2 88/08/01 4.0 RPCSRC";
|
||||
#else
|
||||
__RCSID("$NetBSD: pmap_getport.c,v 1.10 1999/01/20 11:37:37 lukem Exp $");
|
||||
__RCSID("$NetBSD: pmap_getport.c,v 1.11 1999/01/31 20:45:31 christos Exp $");
|
||||
#endif
|
||||
#endif
|
||||
|
||||
@ -91,8 +91,9 @@ pmap_getport(address, program, version, protocol)
|
||||
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) {
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: pmap_prot2.c,v 1.8 1998/11/15 17:32:43 christos Exp $ */
|
||||
/* $NetBSD: pmap_prot2.c,v 1.9 1999/01/31 20:45:31 christos Exp $ */
|
||||
|
||||
/*
|
||||
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
|
||||
@ -35,7 +35,7 @@
|
||||
static char *sccsid = "@(#)pmap_prot2.c 1.3 87/08/11 Copyr 1984 Sun Micro";
|
||||
static char *sccsid = "@(#)pmap_prot2.c 2.1 88/07/29 4.0 RPCSRC";
|
||||
#else
|
||||
__RCSID("$NetBSD: pmap_prot2.c,v 1.8 1998/11/15 17:32:43 christos Exp $");
|
||||
__RCSID("$NetBSD: pmap_prot2.c,v 1.9 1999/01/31 20:45:31 christos Exp $");
|
||||
#endif
|
||||
#endif
|
||||
|
||||
@ -122,7 +122,7 @@ xdr_pmaplist(xdrs, rp)
|
||||
if (freeing)
|
||||
next = &((*rp)->pml_next);
|
||||
if (! xdr_reference(xdrs, (caddr_t *)rp,
|
||||
(u_int)sizeof(struct pmaplist), xdr_pmap))
|
||||
(u_int)sizeof(struct pmaplist), (xdrproc_t)xdr_pmap))
|
||||
return (FALSE);
|
||||
rp = (freeing) ? next : &((*rp)->pml_next);
|
||||
}
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: pmap_rmt.c,v 1.18 1999/01/20 11:37:37 lukem Exp $ */
|
||||
/* $NetBSD: pmap_rmt.c,v 1.19 1999/01/31 20:45:31 christos Exp $ */
|
||||
|
||||
/*
|
||||
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
|
||||
@ -35,7 +35,7 @@
|
||||
static char *sccsid = "@(#)pmap_rmt.c 1.21 87/08/27 Copyr 1984 Sun Micro";
|
||||
static char *sccsid = "@(#)pmap_rmt.c 2.2 88/08/01 4.0 RPCSRC";
|
||||
#else
|
||||
__RCSID("$NetBSD: pmap_rmt.c,v 1.18 1999/01/20 11:37:37 lukem Exp $");
|
||||
__RCSID("$NetBSD: pmap_rmt.c,v 1.19 1999/01/31 20:45:31 christos Exp $");
|
||||
#endif
|
||||
#endif
|
||||
|
||||
@ -116,8 +116,9 @@ pmap_rmtcall(addr, prog, vers, proc, xdrargs, argsp, xdrres, resp, tout,
|
||||
r.port_ptr = port_ptr;
|
||||
r.results_ptr = resp;
|
||||
r.xdr_results = xdrres;
|
||||
stat = CLNT_CALL(client, PMAPPROC_CALLIT, xdr_rmtcall_args, &a,
|
||||
xdr_rmtcallres, &r, tout);
|
||||
stat = CLNT_CALL(client, PMAPPROC_CALLIT,
|
||||
(xdrproc_t)xdr_rmtcall_args, &a, (xdrproc_t)xdr_rmtcallres,
|
||||
&r, tout);
|
||||
CLNT_DESTROY(client);
|
||||
} else {
|
||||
stat = RPC_FAILED;
|
||||
@ -173,7 +174,7 @@ xdr_rmtcallres(xdrs, crp)
|
||||
|
||||
port_ptr = (caddr_t)(void *)crp->port_ptr;
|
||||
if (xdr_reference(xdrs, &port_ptr, sizeof (u_long),
|
||||
xdr_u_long) && xdr_u_long(xdrs, &crp->resultslen)) {
|
||||
(xdrproc_t)xdr_u_long) && xdr_u_long(xdrs, &crp->resultslen)) {
|
||||
crp->port_ptr = (u_long *)(void *)port_ptr;
|
||||
return ((*(crp->xdr_results))(xdrs, crp->results_ptr));
|
||||
}
|
||||
@ -346,7 +347,7 @@ clnt_broadcast(prog, vers, proc, xargs, argsp, xresults, resultsp, eachresult)
|
||||
milliseconds = (int)(t.tv_sec * 1000 + t.tv_usec / 1000);
|
||||
msg.acpted_rply.ar_verf = _null_auth;
|
||||
msg.acpted_rply.ar_results.where = (caddr_t)(void *)&r;
|
||||
msg.acpted_rply.ar_results.proc = xdr_rmtcallres;
|
||||
msg.acpted_rply.ar_results.proc = (xdrproc_t)xdr_rmtcallres;
|
||||
switch (poll(&fd, 1, milliseconds)) {
|
||||
|
||||
case 0: /* timed out */
|
||||
@ -397,7 +398,7 @@ clnt_broadcast(prog, vers, proc, xargs, argsp, xresults, resultsp, eachresult)
|
||||
#endif
|
||||
}
|
||||
xdrs->x_op = XDR_FREE;
|
||||
msg.acpted_rply.ar_results.proc = xdr_void;
|
||||
msg.acpted_rply.ar_results.proc = (xdrproc_t)xdr_void;
|
||||
(void)xdr_replymsg(xdrs, &msg);
|
||||
(void)(*xresults)(xdrs, resultsp);
|
||||
xdr_destroy(xdrs);
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: rpc_prot.c,v 1.11 1999/01/20 11:37:38 lukem Exp $ */
|
||||
/* $NetBSD: rpc_prot.c,v 1.12 1999/01/31 20:45:31 christos Exp $ */
|
||||
|
||||
/*
|
||||
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
|
||||
@ -35,7 +35,7 @@
|
||||
static char *sccsid = "@(#)rpc_prot.c 1.36 87/08/11 Copyr 1984 Sun Micro";
|
||||
static char *sccsid = "@(#)rpc_prot.c 2.3 88/08/07 4.0 RPCSRC";
|
||||
#else
|
||||
__RCSID("$NetBSD: rpc_prot.c,v 1.11 1999/01/20 11:37:38 lukem Exp $");
|
||||
__RCSID("$NetBSD: rpc_prot.c,v 1.12 1999/01/31 20:45:31 christos Exp $");
|
||||
#endif
|
||||
#endif
|
||||
|
||||
@ -163,8 +163,8 @@ xdr_rejected_reply(xdrs, rr)
|
||||
}
|
||||
|
||||
static const struct xdr_discrim reply_dscrm[3] = {
|
||||
{ (int)MSG_ACCEPTED, xdr_accepted_reply },
|
||||
{ (int)MSG_DENIED, xdr_rejected_reply },
|
||||
{ (int)MSG_ACCEPTED, (xdrproc_t)xdr_accepted_reply },
|
||||
{ (int)MSG_DENIED, (xdrproc_t)xdr_rejected_reply },
|
||||
{ __dontcare__, NULL_xdrproc_t } };
|
||||
|
||||
/*
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: svc_simple.c,v 1.13 1999/01/20 11:37:39 lukem Exp $ */
|
||||
/* $NetBSD: svc_simple.c,v 1.14 1999/01/31 20:45:31 christos Exp $ */
|
||||
|
||||
/*
|
||||
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
|
||||
@ -35,7 +35,7 @@
|
||||
static char *sccsid = "@(#)svc_simple.c 1.18 87/08/11 Copyr 1984 Sun Micro";
|
||||
static char *sccsid = "@(#)svc_simple.c 2.2 88/08/01 4.0 RPCSRC";
|
||||
#else
|
||||
__RCSID("$NetBSD: svc_simple.c,v 1.13 1999/01/20 11:37:39 lukem Exp $");
|
||||
__RCSID("$NetBSD: svc_simple.c,v 1.14 1999/01/31 20:45:31 christos Exp $");
|
||||
#endif
|
||||
#endif
|
||||
|
||||
@ -130,7 +130,7 @@ universal(rqstp, transp)
|
||||
* enforce "procnum 0 is echo" convention
|
||||
*/
|
||||
if (rqstp->rq_proc == NULLPROC) {
|
||||
if (svc_sendreply(transp, xdr_void, NULL) == FALSE) {
|
||||
if (svc_sendreply(transp, (xdrproc_t)xdr_void, NULL) == FALSE) {
|
||||
errx(1, "svc_sendreply failed");
|
||||
exit(1);
|
||||
}
|
||||
@ -148,7 +148,7 @@ universal(rqstp, transp)
|
||||
}
|
||||
outdata = (*(plist->p_progname))(xdrbuf);
|
||||
if (outdata == NULL &&
|
||||
plist->p_outproc != xdr_void)
|
||||
plist->p_outproc != (xdrproc_t)xdr_void)
|
||||
/* there was an error */
|
||||
return;
|
||||
if (!svc_sendreply(transp, plist->p_outproc, outdata))
|
||||
|
Loading…
Reference in New Issue
Block a user