Module Name: src
Committed By: plunky
Date: Tue Aug 30 17:06:22 UTC 2011
Modified Files:
src/include/rpc: clnt.h svc.h
src/lib/libquota: getnfsquota.c
src/lib/librpcsvc: rnusers.x
src/libexec/rpc.rquotad: rquotad.c
src/libexec/rpc.rstatd: rstat_proc.c
src/libexec/rpc.rusersd: rusers_proc.c
src/libexec/rpc.rwalld: rwalld.c
src/libexec/rpc.sprayd: sprayd.c
src/tests/fs/nfs/nfsservice: mountd.c
src/usr.bin/rup: rup.c
src/usr.bin/rusers: rusers.c
src/usr.bin/showmount: showmount.c
src/usr.bin/ypwhich: ypwhich.c
src/usr.sbin/mountd: mountd.c
src/usr.sbin/rpc.lockd: lockd_lock.c
src/usr.sbin/rpc.yppasswdd: rpc.yppasswdd.c yppasswdd_mkpw.c
src/usr.sbin/ypbind: ypbind.c
src/usr.sbin/yppoll: yppoll.c
src/usr.sbin/ypserv/common: yplib_host.c
src/usr.sbin/ypserv/yppush: yppush_svc.c
src/usr.sbin/ypserv/ypserv: ypserv.c ypserv_proc.c
Log Message:
Apply casts to cases where xdrproc_t is expected but is not
strictly passed, for example because the second argument is
a different kind of pointer.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/include/rpc/clnt.h
cvs rdiff -u -r1.23 -r1.24 src/include/rpc/svc.h
cvs rdiff -u -r1.1 -r1.2 src/lib/libquota/getnfsquota.c
cvs rdiff -u -r1.13 -r1.14 src/lib/librpcsvc/rnusers.x
cvs rdiff -u -r1.28 -r1.29 src/libexec/rpc.rquotad/rquotad.c
cvs rdiff -u -r1.44 -r1.45 src/libexec/rpc.rstatd/rstat_proc.c
cvs rdiff -u -r1.26 -r1.27 src/libexec/rpc.rusersd/rusers_proc.c
cvs rdiff -u -r1.21 -r1.22 src/libexec/rpc.rwalld/rwalld.c
cvs rdiff -u -r1.16 -r1.17 src/libexec/rpc.sprayd/sprayd.c
cvs rdiff -u -r1.5 -r1.6 src/tests/fs/nfs/nfsservice/mountd.c
cvs rdiff -u -r1.27 -r1.28 src/usr.bin/rup/rup.c
cvs rdiff -u -r1.23 -r1.24 src/usr.bin/rusers/rusers.c
cvs rdiff -u -r1.18 -r1.19 src/usr.bin/showmount/showmount.c
cvs rdiff -u -r1.18 -r1.19 src/usr.bin/ypwhich/ypwhich.c
cvs rdiff -u -r1.120 -r1.121 src/usr.sbin/mountd/mountd.c
cvs rdiff -u -r1.31 -r1.32 src/usr.sbin/rpc.lockd/lockd_lock.c
cvs rdiff -u -r1.14 -r1.15 src/usr.sbin/rpc.yppasswdd/rpc.yppasswdd.c
cvs rdiff -u -r1.17 -r1.18 src/usr.sbin/rpc.yppasswdd/yppasswdd_mkpw.c
cvs rdiff -u -r1.89 -r1.90 src/usr.sbin/ypbind/ypbind.c
cvs rdiff -u -r1.14 -r1.15 src/usr.sbin/yppoll/yppoll.c
cvs rdiff -u -r1.8 -r1.9 src/usr.sbin/ypserv/common/yplib_host.c
cvs rdiff -u -r1.9 -r1.10 src/usr.sbin/ypserv/yppush/yppush_svc.c
cvs rdiff -u -r1.24 -r1.25 src/usr.sbin/ypserv/ypserv/ypserv.c
cvs rdiff -u -r1.15 -r1.16 src/usr.sbin/ypserv/ypserv/ypserv_proc.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/include/rpc/clnt.h
diff -u src/include/rpc/clnt.h:1.20 src/include/rpc/clnt.h:1.21
--- src/include/rpc/clnt.h:1.20 Sat Dec 3 15:16:19 2005
+++ src/include/rpc/clnt.h Tue Aug 30 17:06:20 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: clnt.h,v 1.20 2005/12/03 15:16:19 yamt Exp $ */
+/* $NetBSD: clnt.h,v 1.21 2011/08/30 17:06:20 plunky Exp $ */
/*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -206,11 +206,13 @@
* struct timeval timeout;
*/
#define CLNT_CALL(rh, proc, xargs, argsp, xres, resp, secs) \
- ((*(rh)->cl_ops->cl_call)(rh, proc, xargs, \
- (const char *)(const void *)(argsp), xres, (caddr_t)(void *)resp, secs))
+ ((*(rh)->cl_ops->cl_call)(rh, proc, (xdrproc_t)xargs, \
+ (const char *)(const void *)(argsp), (xdrproc_t)xres, \
+ (caddr_t)(void *)resp, secs))
#define clnt_call(rh, proc, xargs, argsp, xres, resp, secs) \
- ((*(rh)->cl_ops->cl_call)(rh, proc, xargs, \
- (const char *)(const void *)(argsp), xres, (caddr_t)(void *)resp, secs))
+ ((*(rh)->cl_ops->cl_call)(rh, proc, (xdrproc_t)xargs, \
+ (const char *)(const void *)(argsp), (xdrproc_t)xres, \
+ (caddr_t)(void *)resp, secs))
/*
* void
Index: src/include/rpc/svc.h
diff -u src/include/rpc/svc.h:1.23 src/include/rpc/svc.h:1.24
--- src/include/rpc/svc.h:1.23 Mon Dec 26 19:01:47 2005
+++ src/include/rpc/svc.h Tue Aug 30 17:06:20 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: svc.h,v 1.23 2005/12/26 19:01:47 perry Exp $ */
+/* $NetBSD: svc.h,v 1.24 2011/08/30 17:06:20 plunky Exp $ */
/*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -163,9 +163,9 @@
(*(xprt)->xp_ops->xp_stat)(xprt)
#define SVC_GETARGS(xprt, xargs, argsp) \
- (*(xprt)->xp_ops->xp_getargs)((xprt), (xargs), (argsp))
+ (*(xprt)->xp_ops->xp_getargs)((xprt), ((xdrproc_t)(xargs)), (argsp))
#define svc_getargs(xprt, xargs, argsp) \
- (*(xprt)->xp_ops->xp_getargs)((xprt), (xargs), (argsp))
+ (*(xprt)->xp_ops->xp_getargs)((xprt), ((xdrproc_t)(xargs)), (argsp))
#define SVC_REPLY(xprt, msg) \
(*(xprt)->xp_ops->xp_reply) ((xprt), (msg))
@@ -173,9 +173,9 @@
(*(xprt)->xp_ops->xp_reply) ((xprt), (msg))
#define SVC_FREEARGS(xprt, xargs, argsp) \
- (*(xprt)->xp_ops->xp_freeargs)((xprt), (xargs), (argsp))
+ (*(xprt)->xp_ops->xp_freeargs)((xprt), ((xdrproc_t)(xargs)), (argsp))
#define svc_freeargs(xprt, xargs, argsp) \
- (*(xprt)->xp_ops->xp_freeargs)((xprt), (xargs), (argsp))
+ (*(xprt)->xp_ops->xp_freeargs)((xprt), ((xdrproc_t)(xargs)), (argsp))
#define SVC_DESTROY(xprt) \
(*(xprt)->xp_ops->xp_destroy)(xprt)
Index: src/lib/libquota/getnfsquota.c
diff -u src/lib/libquota/getnfsquota.c:1.1 src/lib/libquota/getnfsquota.c:1.2
--- src/lib/libquota/getnfsquota.c:1.1 Thu Mar 24 17:05:43 2011
+++ src/lib/libquota/getnfsquota.c Tue Aug 30 17:06:20 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: getnfsquota.c,v 1.1 2011/03/24 17:05:43 bouyer Exp $ */
+/* $NetBSD: getnfsquota.c,v 1.2 2011/08/30 17:06:20 plunky Exp $ */
/*
* Copyright (c) 1980, 1990, 1993
@@ -42,7 +42,7 @@
#if 0
static char sccsid[] = "@(#)quota.c 8.4 (Berkeley) 4/28/95";
#else
-__RCSID("$NetBSD: getnfsquota.c,v 1.1 2011/03/24 17:05:43 bouyer Exp $");
+__RCSID("$NetBSD: getnfsquota.c,v 1.2 2011/08/30 17:06:20 plunky Exp $");
#endif
#endif /* not lint */
@@ -151,15 +151,15 @@
ext_gq_args.gqa_id = id;
ext_gq_args.gqa_type = rpcqtype;
ret = callaurpc(host, RQUOTAPROG, EXT_RQUOTAVERS,
- RQUOTAPROC_GETQUOTA, xdr_ext_getquota_args, &ext_gq_args,
- xdr_getquota_rslt, &gq_rslt);
+ RQUOTAPROC_GETQUOTA, (xdrproc_t)xdr_ext_getquota_args,
+ &ext_gq_args, (xdrproc_t)xdr_getquota_rslt, &gq_rslt);
if (ret == RPC_PROGVERSMISMATCH && rpcqtype == RQUOTA_USRQUOTA) {
/* try RQUOTAVERS */
gq_args.gqa_pathp = path;
gq_args.gqa_uid = id;
ret = callaurpc(host, RQUOTAPROG, RQUOTAVERS,
- RQUOTAPROC_GETQUOTA, xdr_getquota_args, &gq_args,
- xdr_getquota_rslt, &gq_rslt);
+ RQUOTAPROC_GETQUOTA, (xdrproc_t)xdr_getquota_args,
+ &gq_args, (xdrproc_t)xdr_getquota_rslt, &gq_rslt);
}
free(host);
Index: src/lib/librpcsvc/rnusers.x
diff -u src/lib/librpcsvc/rnusers.x:1.13 src/lib/librpcsvc/rnusers.x:1.14
--- src/lib/librpcsvc/rnusers.x:1.13 Thu May 11 17:11:57 2006
+++ src/lib/librpcsvc/rnusers.x Tue Aug 30 17:06:20 2011
@@ -36,7 +36,7 @@
%#ifndef __lint__
%/*static char sccsid[] = "from: @(#)rnusers.x 1.2 87/09/20 Copyr 1987 Sun Micro";*/
%/*static char sccsid[] = "from: @(#)rnusers.x 2.1 88/08/01 4.0 RPCSRC";*/
-%__RCSID("$NetBSD: rnusers.x,v 1.13 2006/05/11 17:11:57 mrg Exp $");
+%__RCSID("$NetBSD: rnusers.x,v 1.14 2011/08/30 17:06:20 plunky Exp $");
%#endif /* not __lint__ */
#endif
@@ -146,7 +146,7 @@
%{
%
% if (!xdr_reference(xdrs, (char **) objpp, (u_int)sizeof(struct ru_utmp),
-% xdr_utmp))
+% (xdrproc_t)xdr_utmp))
% return (FALSE);
% return (TRUE);
%}
@@ -159,7 +159,7 @@
%
% if (!xdr_array(xdrs, (char **)(void *)&objp->uta_arr,
% (u_int *)&objp->uta_cnt, MAXUSERS,
-% (u_int)sizeof(struct utmp *), xdr_utmpptr))
+% (u_int)sizeof(struct utmp *), (xdrproc_t)xdr_utmpptr))
% return (FALSE);
% return (TRUE);
%}
@@ -184,7 +184,8 @@
%{
%
% if (!xdr_reference(xdrs, (char **) objpp,
-% (u_int)sizeof(struct utmpidle), xdr_utmpidle))
+% (u_int)sizeof(struct utmpidle),
+% (xdrproc_t)xdr_utmpidle))
% return (FALSE);
% return (TRUE);
%}
@@ -197,7 +198,8 @@
%
% if (!xdr_array(xdrs, (char **)(void *)&objp->uia_arr,
% (u_int *)&objp->uia_cnt, MAXUSERS,
-% (u_int)sizeof(struct utmpidle *), xdr_utmpidleptr))
+% (u_int)sizeof(struct utmpidle *),
+% (xdrproc_t)xdr_utmpidleptr))
% return (FALSE);
% return (TRUE);
%}
Index: src/libexec/rpc.rquotad/rquotad.c
diff -u src/libexec/rpc.rquotad/rquotad.c:1.28 src/libexec/rpc.rquotad/rquotad.c:1.29
--- src/libexec/rpc.rquotad/rquotad.c:1.28 Sat Aug 27 15:46:59 2011
+++ src/libexec/rpc.rquotad/rquotad.c Tue Aug 30 17:06:20 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: rquotad.c,v 1.28 2011/08/27 15:46:59 joerg Exp $ */
+/* $NetBSD: rquotad.c,v 1.29 2011/08/30 17:06:20 plunky Exp $ */
/*
* by Manuel Bouyer (bou...@ensta.fr). Public domain.
@@ -6,7 +6,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: rquotad.c,v 1.28 2011/08/27 15:46:59 joerg Exp $");
+__RCSID("$NetBSD: rquotad.c,v 1.29 2011/08/30 17:06:20 plunky Exp $");
#endif
#include <sys/param.h>
@@ -126,7 +126,7 @@
{
switch (request->rq_proc) {
case NULLPROC:
- (void)svc_sendreply(transp, xdr_void, (char *)NULL);
+ (void)svc_sendreply(transp, (xdrproc_t)xdr_void, (char *)NULL);
break;
case RQUOTAPROC_GETQUOTA:
@@ -147,7 +147,7 @@
{
switch (request->rq_proc) {
case NULLPROC:
- (void)svc_sendreply(transp, xdr_void, (char *)NULL);
+ (void)svc_sendreply(transp, (xdrproc_t)xdr_void, (char *)NULL);
break;
case RQUOTAPROC_GETQUOTA:
@@ -236,7 +236,7 @@
qe[QUOTA_LIMIT_FILE].ufsqe_time - timev.tv_sec;
}
out:
- if (!svc_sendreply(transp, xdr_getquota_rslt, (char *)&getq_rslt))
+ if (!svc_sendreply(transp, (xdrproc_t)xdr_getquota_rslt, (char *)&getq_rslt))
svcerr_systemerr(transp);
if (!svc_freeargs(transp, xdr_getquota_args, (caddr_t)&getq_args)) {
syslog(LOG_ERR, "unable to free arguments");
Index: src/libexec/rpc.rstatd/rstat_proc.c
diff -u src/libexec/rpc.rstatd/rstat_proc.c:1.44 src/libexec/rpc.rstatd/rstat_proc.c:1.45
--- src/libexec/rpc.rstatd/rstat_proc.c:1.44 Mon Mar 16 00:51:06 2009
+++ src/libexec/rpc.rstatd/rstat_proc.c Tue Aug 30 17:06:20 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: rstat_proc.c,v 1.44 2009/03/16 00:51:06 lukem Exp $ */
+/* $NetBSD: rstat_proc.c,v 1.45 2011/08/30 17:06:20 plunky Exp $ */
/*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -35,7 +35,7 @@
static char sccsid[] = "from: @(#)rpc.rstatd.c 1.1 86/09/25 Copyr 1984 Sun Micro";
static char sccsid[] = "from: @(#)rstat_proc.c 2.2 88/08/01 4.0 RPCSRC";
#else
-__RCSID("$NetBSD: rstat_proc.c,v 1.44 2009/03/16 00:51:06 lukem Exp $");
+__RCSID("$NetBSD: rstat_proc.c,v 1.45 2011/08/30 17:06:20 plunky Exp $");
#endif
#endif
@@ -378,7 +378,7 @@
switch (rqstp->rq_proc) {
case NULLPROC:
- (void)svc_sendreply(transp, xdr_void, (char *)NULL);
+ (void)svc_sendreply(transp, (xdrproc_t)xdr_void, (char *)NULL);
goto leave;
case RSTATPROC_STATS:
Index: src/libexec/rpc.rusersd/rusers_proc.c
diff -u src/libexec/rpc.rusersd/rusers_proc.c:1.26 src/libexec/rpc.rusersd/rusers_proc.c:1.27
--- src/libexec/rpc.rusersd/rusers_proc.c:1.26 Mon Mar 16 00:56:16 2009
+++ src/libexec/rpc.rusersd/rusers_proc.c Tue Aug 30 17:06:20 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: rusers_proc.c,v 1.26 2009/03/16 00:56:16 lukem Exp $ */
+/* $NetBSD: rusers_proc.c,v 1.27 2011/08/30 17:06:20 plunky Exp $ */
/*-
* Copyright (c) 1993 John Brezak
@@ -30,7 +30,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: rusers_proc.c,v 1.26 2009/03/16 00:56:16 lukem Exp $");
+__RCSID("$NetBSD: rusers_proc.c,v 1.27 2011/08/30 17:06:20 plunky Exp $");
#endif /* not lint */
#include <sys/types.h>
@@ -360,7 +360,7 @@
switch (rqstp->rq_proc) {
case NULLPROC:
- (void)svc_sendreply(transp, xdr_void, NULL);
+ (void)svc_sendreply(transp, (xdrproc_t)xdr_void, NULL);
goto leave;
case RUSERSPROC_NUM:
Index: src/libexec/rpc.rwalld/rwalld.c
diff -u src/libexec/rpc.rwalld/rwalld.c:1.21 src/libexec/rpc.rwalld/rwalld.c:1.22
--- src/libexec/rpc.rwalld/rwalld.c:1.21 Mon Aug 29 20:41:06 2011
+++ src/libexec/rpc.rwalld/rwalld.c Tue Aug 30 17:06:20 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: rwalld.c,v 1.21 2011/08/29 20:41:06 joerg Exp $ */
+/* $NetBSD: rwalld.c,v 1.22 2011/08/30 17:06:20 plunky Exp $ */
/*
* Copyright (c) 1993 Christopher G. Demetriou
@@ -36,7 +36,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: rwalld.c,v 1.21 2011/08/29 20:41:06 joerg Exp $");
+__RCSID("$NetBSD: rwalld.c,v 1.22 2011/08/30 17:06:20 plunky Exp $");
#endif /* not lint */
#include <unistd.h>
@@ -157,7 +157,7 @@
switch (rqstp->rq_proc) {
case NULLPROC:
- (void)svc_sendreply(transp, xdr_void, (char *)NULL);
+ (void)svc_sendreply(transp, (xdrproc_t)xdr_void, (char *)NULL);
goto leave;
case WALLPROC_WALL:
Index: src/libexec/rpc.sprayd/sprayd.c
diff -u src/libexec/rpc.sprayd/sprayd.c:1.16 src/libexec/rpc.sprayd/sprayd.c:1.17
--- src/libexec/rpc.sprayd/sprayd.c:1.16 Mon Aug 29 20:41:06 2011
+++ src/libexec/rpc.sprayd/sprayd.c Tue Aug 30 17:06:21 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: sprayd.c,v 1.16 2011/08/29 20:41:06 joerg Exp $ */
+/* $NetBSD: sprayd.c,v 1.17 2011/08/30 17:06:21 plunky Exp $ */
/*
* Copyright (c) 1994 Christos Zoulas
@@ -27,7 +27,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: sprayd.c,v 1.16 2011/08/29 20:41:06 joerg Exp $");
+__RCSID("$NetBSD: sprayd.c,v 1.17 2011/08/30 17:06:21 plunky Exp $");
#endif /* not lint */
#include <stdio.h>
@@ -131,7 +131,7 @@
/*FALLTHROUGH*/
case NULLPROC:
- (void)svc_sendreply(transp, xdr_void, (char *)NULL);
+ (void)svc_sendreply(transp, (xdrproc_t)xdr_void, (char *)NULL);
return;
case SPRAYPROC_SPRAY:
@@ -150,7 +150,7 @@
return;
}
- if (!svc_sendreply(transp, xdr_spraycumul, (caddr_t)&scum)) {
+ if (!svc_sendreply(transp, (xdrproc_t)xdr_spraycumul, (caddr_t)&scum)) {
svcerr_systemerr(transp);
syslog(LOG_WARNING, "bad svc_sendreply");
}
Index: src/tests/fs/nfs/nfsservice/mountd.c
diff -u src/tests/fs/nfs/nfsservice/mountd.c:1.5 src/tests/fs/nfs/nfsservice/mountd.c:1.6
--- src/tests/fs/nfs/nfsservice/mountd.c:1.5 Fri Dec 31 17:59:24 2010
+++ src/tests/fs/nfs/nfsservice/mountd.c Tue Aug 30 17:06:21 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: mountd.c,v 1.5 2010/12/31 17:59:24 pooka Exp $ */
+/* $NetBSD: mountd.c,v 1.6 2011/08/30 17:06:21 plunky Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -42,7 +42,7 @@
#if 0
static char sccsid[] = "@(#)mountd.c 8.15 (Berkeley) 5/1/95";
#else
-__RCSID("$NetBSD: mountd.c,v 1.5 2010/12/31 17:59:24 pooka Exp $");
+__RCSID("$NetBSD: mountd.c,v 1.6 2011/08/30 17:06:21 plunky Exp $");
#endif
#endif /* not lint */
@@ -536,7 +536,7 @@
ret = 0;
switch (rqstp->rq_proc) {
case NULLPROC:
- if (!svc_sendreply(transp, xdr_void, NULL))
+ if (!svc_sendreply(transp, (xdrproc_t)xdr_void, NULL))
syslog(LOG_ERR, "Can't send reply");
return;
case MOUNTPROC_MNT:
@@ -567,7 +567,7 @@
if (debug)
(void)fprintf(stderr, "-> stat failed on %s\n",
dpath);
- if (!svc_sendreply(transp, xdr_long, (caddr_t) &bad))
+ if (!svc_sendreply(transp, (xdrproc_t)xdr_long, (caddr_t) &bad))
syslog(LOG_ERR, "Can't send reply");
return;
}
@@ -603,7 +603,7 @@
if (rump_sys_getfh(dpath, &fhr.fhr_fh, &fh_size) < 0) {
bad = error;
//syslog(LOG_ERR, "Can't get fh for %s %d %d", dpath, error, fh_size);
- if (!svc_sendreply(transp, xdr_long,
+ if (!svc_sendreply(transp, (xdrproc_t)xdr_long,
(char *)&bad))
syslog(LOG_ERR, "Can't send reply");
goto out;
@@ -611,13 +611,13 @@
if ((fhr.fhr_vers == 1 && fh_size > NFSX_V2FH) ||
fh_size > NFSX_V3FHMAX) {
bad = EINVAL; /* XXX */
- if (!svc_sendreply(transp, xdr_long,
+ if (!svc_sendreply(transp, (xdrproc_t)xdr_long,
(char *)&bad))
syslog(LOG_ERR, "Can't send reply");
goto out;
}
fhr.fhr_fhsize = fh_size;
- if (!svc_sendreply(transp, xdr_fhs, (char *) &fhr))
+ if (!svc_sendreply(transp, (xdrproc_t)xdr_fhs, (char *) &fhr))
syslog(LOG_ERR, "Can't send reply");
if (!lookup_failed)
add_mlist(host, dpath, hostset);
@@ -626,14 +626,14 @@
if (debug)
(void)fprintf(stderr, "Mount successful.\n");
} else {
- if (!svc_sendreply(transp, xdr_long, (caddr_t) &bad))
+ if (!svc_sendreply(transp, (xdrproc_t)xdr_long, (caddr_t) &bad))
syslog(LOG_ERR, "Can't send reply");
}
out:
(void)sigprocmask(SIG_UNBLOCK, &sighup_mask, NULL);
return;
case MOUNTPROC_DUMP:
- if (!svc_sendreply(transp, xdr_mlist, NULL))
+ if (!svc_sendreply(transp, (xdrproc_t)xdr_mlist, NULL))
syslog(LOG_ERR, "Can't send reply");
return;
case MOUNTPROC_UMNT:
@@ -648,7 +648,7 @@
svcerr_weakauth(transp);
return;
}
- if (!svc_sendreply(transp, xdr_void, NULL))
+ if (!svc_sendreply(transp, (xdrproc_t)xdr_void, NULL))
syslog(LOG_ERR, "Can't send reply");
return;
case MOUNTPROC_UMNTALL:
@@ -659,12 +659,12 @@
svcerr_weakauth(transp);
return;
}
- if (!svc_sendreply(transp, xdr_void, NULL))
+ if (!svc_sendreply(transp, (xdrproc_t)xdr_void, NULL))
syslog(LOG_ERR, "Can't send reply");
return;
case MOUNTPROC_EXPORT:
case MOUNTPROC_EXPORTALL:
- if (!svc_sendreply(transp, xdr_explist, NULL))
+ if (!svc_sendreply(transp, (xdrproc_t)xdr_explist, NULL))
syslog(LOG_ERR, "Can't send reply");
return;
Index: src/usr.bin/rup/rup.c
diff -u src/usr.bin/rup/rup.c:1.27 src/usr.bin/rup/rup.c:1.28
--- src/usr.bin/rup/rup.c:1.27 Sat Dec 15 19:44:53 2007
+++ src/usr.bin/rup/rup.c Tue Aug 30 17:06:21 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: rup.c,v 1.27 2007/12/15 19:44:53 perry Exp $ */
+/* $NetBSD: rup.c,v 1.28 2011/08/30 17:06:21 plunky Exp $ */
/*-
* Copyright (c) 1993, John Brezak
@@ -35,7 +35,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: rup.c,v 1.27 2007/12/15 19:44:53 perry Exp $");
+__RCSID("$NetBSD: rup.c,v 1.28 2011/08/30 17:06:21 plunky Exp $");
#endif /* not lint */
#include <sys/types.h>
@@ -323,7 +323,7 @@
}
clnt_stat = rpc_broadcast(RSTATPROG, RSTATVERS_TIME, RSTATPROC_STATS,
- xdr_void, NULL, xdr_statstime, (caddr_t)(void *)&host_stat,
+ (xdrproc_t)xdr_void, NULL, (xdrproc_t)xdr_statstime, (caddr_t)(void *)&host_stat,
(resultproc_t)rstat_reply, "udp");
if (clnt_stat != RPC_SUCCESS && clnt_stat != RPC_TIMEDOUT)
errx(1, "%s", clnt_sperrno(clnt_stat));
Index: src/usr.bin/rusers/rusers.c
diff -u src/usr.bin/rusers/rusers.c:1.23 src/usr.bin/rusers/rusers.c:1.24
--- src/usr.bin/rusers/rusers.c:1.23 Thu May 11 01:25:23 2006
+++ src/usr.bin/rusers/rusers.c Tue Aug 30 17:06:21 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: rusers.c,v 1.23 2006/05/11 01:25:23 mrg Exp $ */
+/* $NetBSD: rusers.c,v 1.24 2011/08/30 17:06:21 plunky Exp $ */
/*-
* Copyright (c) 1993 John Brezak
@@ -30,7 +30,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: rusers.c,v 1.23 2006/05/11 01:25:23 mrg Exp $");
+__RCSID("$NetBSD: rusers.c,v 1.24 2011/08/30 17:06:21 plunky Exp $");
#endif /* not lint */
#include <sys/types.h>
@@ -262,8 +262,9 @@
memset((char *)&up, 0, sizeof(up));
clnt_stat = rpc_broadcast(RUSERSPROG, RUSERSVERS_IDLE,
- RUSERSPROC_NAMES, xdr_void, NULL, xdr_utmpidlearr,
- (char *)&up, (resultproc_t)rusers_reply, "udp");
+ RUSERSPROC_NAMES, (xdrproc_t)xdr_void, NULL,
+ (xdrproc_t)xdr_utmpidlearr, (char *)&up,
+ (resultproc_t)rusers_reply, "udp");
if (clnt_stat != RPC_SUCCESS && clnt_stat != RPC_TIMEDOUT)
errx(1, "%s", clnt_sperrno(clnt_stat));
}
Index: src/usr.bin/showmount/showmount.c
diff -u src/usr.bin/showmount/showmount.c:1.18 src/usr.bin/showmount/showmount.c:1.19
--- src/usr.bin/showmount/showmount.c:1.18 Sun Feb 27 10:11:27 2011
+++ src/usr.bin/showmount/showmount.c Tue Aug 30 17:06:21 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: showmount.c,v 1.18 2011/02/27 10:11:27 mbalmer Exp $ */
+/* $NetBSD: showmount.c,v 1.19 2011/08/30 17:06:21 plunky Exp $ */
/*
* Copyright (c) 1989, 1993, 1995
@@ -42,7 +42,7 @@
#if 0
static char sccsid[] = "@(#)showmount.c 8.3 (Berkeley) 3/29/95";
#endif
-__RCSID("$NetBSD: showmount.c,v 1.18 2011/02/27 10:11:27 mbalmer Exp $");
+__RCSID("$NetBSD: showmount.c,v 1.19 2011/08/30 17:06:21 plunky Exp $");
#endif /* not lint */
#include <sys/types.h>
@@ -153,16 +153,16 @@
if (rpcs & DODUMP)
if ((estat = tcp_callrpc(host, RPCPROG_MNT, mntvers,
- RPCMNT_DUMP, xdr_void, (char *)0,
- xdr_mntdump, (char *)&mntdump)) != 0) {
+ RPCMNT_DUMP, (xdrproc_t)xdr_void, (char *)0,
+ (xdrproc_t)xdr_mntdump, (char *)&mntdump)) != 0) {
fprintf(stderr, "showmount: Can't do Mountdump rpc: ");
clnt_perrno(estat);
exit(1);
}
if (rpcs & DOEXPORTS)
if ((estat = tcp_callrpc(host, RPCPROG_MNT, mntvers,
- RPCMNT_EXPORT, xdr_void, (char *)0,
- xdr_exports, (char *)&exports)) != 0) {
+ RPCMNT_EXPORT, (xdrproc_t)xdr_void, (char *)0,
+ (xdrproc_t)xdr_exports, (char *)&exports)) != 0) {
fprintf(stderr, "showmount: Can't do Exports rpc: ");
clnt_perrno(estat);
exit(1);
Index: src/usr.bin/ypwhich/ypwhich.c
diff -u src/usr.bin/ypwhich/ypwhich.c:1.18 src/usr.bin/ypwhich/ypwhich.c:1.19
--- src/usr.bin/ypwhich/ypwhich.c:1.18 Tue Feb 1 20:58:15 2011
+++ src/usr.bin/ypwhich/ypwhich.c Tue Aug 30 17:06:21 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ypwhich.c,v 1.18 2011/02/01 20:58:15 chuck Exp $ */
+/* $NetBSD: ypwhich.c,v 1.19 2011/08/30 17:06:21 plunky Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor
@@ -394,7 +394,7 @@
(void)printf("%s %s\n", ypml->ypml_name,
yprespmaster.master);
}
- xdr_free(xdr_ypresp_master, (void *)&yprespmaster);
+ xdr_free((xdrproc_t)xdr_ypresp_master, (void *)&yprespmaster);
}
clnt_destroy(ypserv);
Index: src/usr.sbin/mountd/mountd.c
diff -u src/usr.sbin/mountd/mountd.c:1.120 src/usr.sbin/mountd/mountd.c:1.121
--- src/usr.sbin/mountd/mountd.c:1.120 Sun Oct 11 16:30:19 2009
+++ src/usr.sbin/mountd/mountd.c Tue Aug 30 17:06:21 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: mountd.c,v 1.120 2009/10/11 16:30:19 pooka Exp $ */
+/* $NetBSD: mountd.c,v 1.121 2011/08/30 17:06:21 plunky Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -42,7 +42,7 @@
#if 0
static char sccsid[] = "@(#)mountd.c 8.15 (Berkeley) 5/1/95";
#else
-__RCSID("$NetBSD: mountd.c,v 1.120 2009/10/11 16:30:19 pooka Exp $");
+__RCSID("$NetBSD: mountd.c,v 1.121 2011/08/30 17:06:21 plunky Exp $");
#endif
#endif /* not lint */
@@ -522,7 +522,7 @@
ret = 0;
switch (rqstp->rq_proc) {
case NULLPROC:
- if (!svc_sendreply(transp, xdr_void, NULL))
+ if (!svc_sendreply(transp, (xdrproc_t)xdr_void, NULL))
syslog(LOG_ERR, "Can't send reply");
return;
case MOUNTPROC_MNT:
@@ -550,7 +550,7 @@
if (debug)
(void)fprintf(stderr, "-> stat failed on %s\n",
rdirpath);
- if (!svc_sendreply(transp, xdr_long, (caddr_t) &bad))
+ if (!svc_sendreply(transp, (xdrproc_t)xdr_long, (caddr_t) &bad))
syslog(LOG_ERR, "Can't send reply");
return;
}
@@ -585,7 +585,7 @@
if (getfh(rdirpath, &fhr.fhr_fh, &fh_size) < 0) {
bad = errno;
syslog(LOG_ERR, "Can't get fh for %s", rdirpath);
- if (!svc_sendreply(transp, xdr_long,
+ if (!svc_sendreply(transp, (xdrproc_t)xdr_long,
(char *)&bad))
syslog(LOG_ERR, "Can't send reply");
goto out;
@@ -593,13 +593,13 @@
if ((fhr.fhr_vers == 1 && fh_size > NFSX_V2FH) ||
fh_size > NFSX_V3FHMAX) {
bad = EINVAL; /* XXX */
- if (!svc_sendreply(transp, xdr_long,
+ if (!svc_sendreply(transp, (xdrproc_t)xdr_long,
(char *)&bad))
syslog(LOG_ERR, "Can't send reply");
goto out;
}
fhr.fhr_fhsize = fh_size;
- if (!svc_sendreply(transp, xdr_fhs, (char *) &fhr))
+ if (!svc_sendreply(transp, (xdrproc_t)xdr_fhs, (char *) &fhr))
syslog(LOG_ERR, "Can't send reply");
if (!lookup_failed)
add_mlist(host, rdirpath, hostset);
@@ -608,14 +608,14 @@
if (debug)
(void)fprintf(stderr, "Mount successful.\n");
} else {
- if (!svc_sendreply(transp, xdr_long, (caddr_t) &bad))
+ if (!svc_sendreply(transp, (xdrproc_t)xdr_long, (caddr_t) &bad))
syslog(LOG_ERR, "Can't send reply");
}
out:
(void)sigprocmask(SIG_UNBLOCK, &sighup_mask, NULL);
return;
case MOUNTPROC_DUMP:
- if (!svc_sendreply(transp, xdr_mlist, NULL))
+ if (!svc_sendreply(transp, (xdrproc_t)xdr_mlist, NULL))
syslog(LOG_ERR, "Can't send reply");
return;
case MOUNTPROC_UMNT:
@@ -630,7 +630,7 @@
svcerr_weakauth(transp);
return;
}
- if (!svc_sendreply(transp, xdr_void, NULL))
+ if (!svc_sendreply(transp, (xdrproc_t)xdr_void, NULL))
syslog(LOG_ERR, "Can't send reply");
return;
case MOUNTPROC_UMNTALL:
@@ -641,12 +641,12 @@
svcerr_weakauth(transp);
return;
}
- if (!svc_sendreply(transp, xdr_void, NULL))
+ if (!svc_sendreply(transp, (xdrproc_t)xdr_void, NULL))
syslog(LOG_ERR, "Can't send reply");
return;
case MOUNTPROC_EXPORT:
case MOUNTPROC_EXPORTALL:
- if (!svc_sendreply(transp, xdr_explist, NULL))
+ if (!svc_sendreply(transp, (xdrproc_t)xdr_explist, NULL))
syslog(LOG_ERR, "Can't send reply");
return;
@@ -2367,7 +2367,8 @@
int n;
{
(void)clnt_broadcast(RPCPROG_MNT, RPCMNT_VER1, RPCMNT_UMNTALL,
- xdr_void, NULL, xdr_void, NULL, (resultproc_t)umntall_each);
+ (xdrproc_t)xdr_void, NULL, (xdrproc_t)xdr_void, NULL,
+ (resultproc_t)umntall_each);
exit(0);
}
Index: src/usr.sbin/rpc.lockd/lockd_lock.c
diff -u src/usr.sbin/rpc.lockd/lockd_lock.c:1.31 src/usr.sbin/rpc.lockd/lockd_lock.c:1.32
--- src/usr.sbin/rpc.lockd/lockd_lock.c:1.31 Thu Nov 19 22:27:26 2009
+++ src/usr.sbin/rpc.lockd/lockd_lock.c Tue Aug 30 17:06:21 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: lockd_lock.c,v 1.31 2009/11/19 22:27:26 christos Exp $ */
+/* $NetBSD: lockd_lock.c,v 1.32 2011/08/30 17:06:21 plunky Exp $ */
/*
* Copyright (c) 2000 Manuel Bouyer.
@@ -791,8 +791,9 @@
my_mon.mon_id.my_id.my_prog = NLM_PROG;
my_mon.mon_id.my_id.my_vers = NLM_SM;
my_mon.mon_id.my_id.my_proc = NLM_SM_NOTIFY;
- if ((retval = callrpc(localhost, SM_PROG, SM_VERS, SM_MON, xdr_mon,
- (void *)&my_mon, xdr_sm_stat_res, (void *)&result)) != 0) {
+ if ((retval = callrpc(localhost, SM_PROG, SM_VERS, SM_MON,
+ (xdrproc_t)xdr_mon, (void *)&my_mon,
+ (xdrproc_t)xdr_sm_stat_res, (void *)&result)) != 0) {
syslog(LOG_WARNING, "rpc to statd failed (%s)",
clnt_sperrno((enum clnt_stat)retval));
free(hp);
Index: src/usr.sbin/rpc.yppasswdd/rpc.yppasswdd.c
diff -u src/usr.sbin/rpc.yppasswdd/rpc.yppasswdd.c:1.14 src/usr.sbin/rpc.yppasswdd/rpc.yppasswdd.c:1.15
--- src/usr.sbin/rpc.yppasswdd/rpc.yppasswdd.c:1.14 Tue May 24 13:27:16 2011
+++ src/usr.sbin/rpc.yppasswdd/rpc.yppasswdd.c Tue Aug 30 17:06:22 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: rpc.yppasswdd.c,v 1.14 2011/05/24 13:27:16 joerg Exp $ */
+/* $NetBSD: rpc.yppasswdd.c,v 1.15 2011/08/30 17:06:22 plunky Exp $ */
/*
* Copyright (c) 1994 Mats O Jansson <m...@stacken.kth.se>
@@ -28,7 +28,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: rpc.yppasswdd.c,v 1.14 2011/05/24 13:27:16 joerg Exp $");
+__RCSID("$NetBSD: rpc.yppasswdd.c,v 1.15 2011/08/30 17:06:22 plunky Exp $");
#endif /* not lint */
#include <sys/types.h>
@@ -142,7 +142,7 @@
switch (rqstp->rq_proc) {
case NULLPROC:
- (void)svc_sendreply(transp, xdr_void, (char *) NULL);
+ (void)svc_sendreply(transp, (xdrproc_t)xdr_void, (char *) NULL);
return;
case YPPASSWDPROC_UPDATE:
Index: src/usr.sbin/rpc.yppasswdd/yppasswdd_mkpw.c
diff -u src/usr.sbin/rpc.yppasswdd/yppasswdd_mkpw.c:1.17 src/usr.sbin/rpc.yppasswdd/yppasswdd_mkpw.c:1.18
--- src/usr.sbin/rpc.yppasswdd/yppasswdd_mkpw.c:1.17 Tue Oct 20 00:51:14 2009
+++ src/usr.sbin/rpc.yppasswdd/yppasswdd_mkpw.c Tue Aug 30 17:06:22 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: yppasswdd_mkpw.c,v 1.17 2009/10/20 00:51:14 snj Exp $ */
+/* $NetBSD: yppasswdd_mkpw.c,v 1.18 2011/08/30 17:06:22 plunky Exp $ */
/*
* Copyright (c) 1996 Jason R. Thorpe <thor...@netbsd.org>
@@ -31,7 +31,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: yppasswdd_mkpw.c,v 1.17 2009/10/20 00:51:14 snj Exp $");
+__RCSID("$NetBSD: yppasswdd_mkpw.c,v 1.18 2011/08/30 17:06:22 plunky Exp $");
#endif /* not lint */
#include <sys/types.h>
@@ -74,7 +74,7 @@
#define REPLY(val) do { \
int res = (val); \
- if (!svc_sendreply(transp, xdr_int, (caddr_t)&res)) \
+ if (!svc_sendreply(transp, (xdrproc_t)xdr_int, (caddr_t)&res)) \
svcerr_systemerr(transp); \
} while (0)
Index: src/usr.sbin/ypbind/ypbind.c
diff -u src/usr.sbin/ypbind/ypbind.c:1.89 src/usr.sbin/ypbind/ypbind.c:1.90
--- src/usr.sbin/ypbind/ypbind.c:1.89 Mon Aug 29 20:38:55 2011
+++ src/usr.sbin/ypbind/ypbind.c Tue Aug 30 17:06:22 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ypbind.c,v 1.89 2011/08/29 20:38:55 joerg Exp $ */
+/* $NetBSD: ypbind.c,v 1.90 2011/08/30 17:06:22 plunky Exp $ */
/*
* Copyright (c) 1992, 1993 Theo de Raadt <dera...@fsa.ca>
@@ -28,7 +28,7 @@
#include <sys/cdefs.h>
#ifndef LINT
-__RCSID("$NetBSD: ypbind.c,v 1.89 2011/08/29 20:38:55 joerg Exp $");
+__RCSID("$NetBSD: ypbind.c,v 1.90 2011/08/30 17:06:22 plunky Exp $");
#endif
#include <sys/types.h>
@@ -576,14 +576,14 @@
switch (rqstp->rq_proc) {
case YPBINDPROC_NULL:
- xdr_argument = xdr_void;
- xdr_result = xdr_void;
+ xdr_argument = (xdrproc_t)xdr_void;
+ xdr_result = (xdrproc_t)xdr_void;
local = ypbindproc_null_2;
break;
case YPBINDPROC_DOMAIN:
- xdr_argument = xdr_ypdomain_wrap_string;
- xdr_result = xdr_ypbind_resp;
+ xdr_argument = (xdrproc_t)xdr_ypdomain_wrap_string;
+ xdr_result = (xdrproc_t)xdr_ypbind_resp;
local = ypbindproc_domain_2;
break;
@@ -601,8 +601,8 @@
return;
}
- xdr_argument = xdr_ypbind_setdom;
- xdr_result = xdr_void;
+ xdr_argument = (xdrproc_t)xdr_ypbind_setdom;
+ xdr_result = (xdrproc_t)xdr_void;
local = ypbindproc_setdom_2;
break;
@@ -663,7 +663,7 @@
rmtca.xdr_args = NULL; /* set at call time */
rmtca.args_ptr = NULL; /* set at call time */
rmtcr.port_ptr = &rmtcr_port;
- rmtcr.xdr_results = xdr_bool;
+ rmtcr.xdr_results = (xdrproc_t)xdr_bool;
rmtcr.results_ptr = (caddr_t)(void *)&rmtcr_outval;
}
@@ -874,7 +874,7 @@
(void)memset(&msg, 0, sizeof(msg));
msg.acpted_rply.ar_verf = _null_auth;
msg.acpted_rply.ar_results.where = (caddr_t)(void *)&rmtcr;
- msg.acpted_rply.ar_results.proc = xdr_rmtcallres;
+ msg.acpted_rply.ar_results.proc = (xdrproc_t)xdr_rmtcallres;
try_again:
fromlen = sizeof(struct sockaddr);
@@ -905,7 +905,7 @@
}
}
xdr.x_op = XDR_FREE;
- msg.acpted_rply.ar_results.proc = xdr_void;
+ msg.acpted_rply.ar_results.proc = (xdrproc_t)xdr_void;
xdr_destroy(&xdr);
return RPC_SUCCESS;
@@ -929,7 +929,7 @@
(void)memset(&msg, 0, sizeof(msg));
msg.acpted_rply.ar_verf = _null_auth;
msg.acpted_rply.ar_results.where = (caddr_t)(void *)&res;
- msg.acpted_rply.ar_results.proc = xdr_bool;
+ msg.acpted_rply.ar_results.proc = (xdrproc_t)xdr_bool;
try_again:
fromlen = sizeof (struct sockaddr);
@@ -959,7 +959,7 @@
}
}
xdr.x_op = XDR_FREE;
- msg.acpted_rply.ar_results.proc = xdr_void;
+ msg.acpted_rply.ar_results.proc = (xdrproc_t)xdr_void;
xdr_destroy(&xdr);
return RPC_SUCCESS;
@@ -977,7 +977,7 @@
XDR xdr;
DPRINTF("nag_servers\n");
- rmtca.xdr_args = xdr_ypdomain_wrap_string;
+ rmtca.xdr_args = (xdrproc_t)xdr_ypdomain_wrap_string;
rmtca.args_ptr = (caddr_t)(void *)&dom_name;
(void)memset(&xdr, 0, sizeof xdr);
Index: src/usr.sbin/yppoll/yppoll.c
diff -u src/usr.sbin/yppoll/yppoll.c:1.14 src/usr.sbin/yppoll/yppoll.c:1.15
--- src/usr.sbin/yppoll/yppoll.c:1.14 Fri Jan 25 19:58:54 2008
+++ src/usr.sbin/yppoll/yppoll.c Tue Aug 30 17:06:22 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: yppoll.c,v 1.14 2008/01/25 19:58:54 christos Exp $ */
+/* $NetBSD: yppoll.c,v 1.15 2011/08/30 17:06:22 plunky Exp $ */
/*
* Copyright (c) 1992, 1993 Theo de Raadt <dera...@fsa.ca>
@@ -57,7 +57,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: yppoll.c,v 1.14 2008/01/25 19:58:54 christos Exp $");
+__RCSID("$NetBSD: yppoll.c,v 1.15 2011/08/30 17:06:22 plunky Exp $");
#endif /* not lint */
#include <sys/param.h>
@@ -201,7 +201,7 @@
clnt_perror(client, "yp_order: clnt_call");
*outorder = ypro.ordernum;
- xdr_free(xdr_ypresp_order, (void *)&ypro);
+ xdr_free((xdrproc_t)xdr_ypresp_order, (void *)&ypro);
r = ypprot_err(ypro.status);
if (r == RPC_SUCCESS) {
@@ -214,7 +214,7 @@
r = ypprot_err(yprm.status);
if (r == 0)
*outname = (char *)strdup(yprm.master);
- xdr_free(xdr_ypresp_master, (void *)&yprm);
+ xdr_free((xdrproc_t)xdr_ypresp_master, (void *)&yprm);
}
clnt_destroy(client);
return r;
Index: src/usr.sbin/ypserv/common/yplib_host.c
diff -u src/usr.sbin/ypserv/common/yplib_host.c:1.8 src/usr.sbin/ypserv/common/yplib_host.c:1.9
--- src/usr.sbin/ypserv/common/yplib_host.c:1.8 Sun Apr 19 06:06:39 2009
+++ src/usr.sbin/ypserv/common/yplib_host.c Tue Aug 30 17:06:22 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: yplib_host.c,v 1.8 2009/04/19 06:06:39 lukem Exp $ */
+/* $NetBSD: yplib_host.c,v 1.9 2011/08/30 17:06:22 plunky Exp $ */
/*
* Copyright (c) 1992, 1993 Theo de Raadt <dera...@theos.com>
@@ -28,7 +28,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: yplib_host.c,v 1.8 2009/04/19 06:06:39 lukem Exp $");
+__RCSID("$NetBSD: yplib_host.c,v 1.9 2011/08/30 17:06:22 plunky Exp $");
#endif
#include <sys/param.h>
@@ -152,7 +152,7 @@
memcpy(*outval, yprv.valdat.dptr, *outvallen);
(*outval)[*outvallen] = '\0';
}
- xdr_free(xdr_ypresp_val, (char *)&yprv);
+ xdr_free((xdrproc_t)xdr_ypresp_val, (char *)&yprv);
return r;
}
@@ -186,7 +186,7 @@
memcpy(*outval, yprkv.valdat.dptr, *outvallen);
(*outval)[*outvallen] = '\0';
}
- xdr_free(xdr_ypresp_key_val, (char *)&yprkv);
+ xdr_free((xdrproc_t)xdr_ypresp_key_val, (char *)&yprkv);
return r;
}
@@ -223,7 +223,7 @@
memcpy(*outval, yprkv.valdat.dptr, *outvallen);
(*outval)[*outvallen] = '\0';
}
- xdr_free(xdr_ypresp_key_val, (char *)&yprkv);
+ xdr_free((xdrproc_t)xdr_ypresp_key_val, (char *)&yprkv);
return r;
}
@@ -264,7 +264,7 @@
clnt_perror(client, "yp_order_host: clnt_call");
*outorder = ypro.ordernum;
- xdr_free(xdr_ypresp_order, (char *)&ypro);
+ xdr_free((xdrproc_t)xdr_ypresp_order, (char *)&ypro);
return ypprot_err(ypro.status);
}
@@ -288,7 +288,7 @@
if (!(r = ypprot_err(yprm.status))) {
*outname = (char *)strdup(yprm.master);
}
- xdr_free(xdr_ypresp_master, (char *)&yprm);
+ xdr_free((xdrproc_t)xdr_ypresp_master, (char *)&yprm);
return r;
}
Index: src/usr.sbin/ypserv/yppush/yppush_svc.c
diff -u src/usr.sbin/ypserv/yppush/yppush_svc.c:1.9 src/usr.sbin/ypserv/yppush/yppush_svc.c:1.10
--- src/usr.sbin/ypserv/yppush/yppush_svc.c:1.9 Wed Oct 21 00:01:57 2009
+++ src/usr.sbin/ypserv/yppush/yppush_svc.c Tue Aug 30 17:06:22 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: yppush_svc.c,v 1.9 2009/10/21 00:01:57 snj Exp $ */
+/* $NetBSD: yppush_svc.c,v 1.10 2011/08/30 17:06:22 plunky Exp $ */
/*
* Copyright (c) 1996 Mats O Jansson <m...@stacken.kth.se>
@@ -28,7 +28,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: yppush_svc.c,v 1.9 2009/10/21 00:01:57 snj Exp $");
+__RCSID("$NetBSD: yppush_svc.c,v 1.10 2011/08/30 17:06:22 plunky Exp $");
#endif
/*
@@ -92,14 +92,14 @@
_rpcsvcdirty = 1;
switch (rqstp->rq_proc) {
case YPPUSHPROC_NULL:
- xdr_argument = xdr_void;
- xdr_result = xdr_void;
+ xdr_argument = (xdrproc_t)xdr_void;
+ xdr_result = (xdrproc_t)xdr_void;
local = yppushproc_null_1_svc;
break;
case YPPUSHPROC_XFRRESP:
- xdr_argument = xdr_yppushresp_xfr;
- xdr_result = xdr_void;
+ xdr_argument = (xdrproc_t)xdr_yppushresp_xfr;
+ xdr_result = (xdrproc_t)xdr_void;
local = yppushproc_xfrresp_1_svc;
break;
Index: src/usr.sbin/ypserv/ypserv/ypserv.c
diff -u src/usr.sbin/ypserv/ypserv/ypserv.c:1.24 src/usr.sbin/ypserv/ypserv/ypserv.c:1.25
--- src/usr.sbin/ypserv/ypserv/ypserv.c:1.24 Mon Apr 25 22:54:05 2011
+++ src/usr.sbin/ypserv/ypserv/ypserv.c Tue Aug 30 17:06:22 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ypserv.c,v 1.24 2011/04/25 22:54:05 wiz Exp $ */
+/* $NetBSD: ypserv.c,v 1.25 2011/08/30 17:06:22 plunky Exp $ */
/*
* Copyright (c) 1994 Mats O Jansson <m...@stacken.kth.se>
@@ -28,7 +28,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: ypserv.c,v 1.24 2011/04/25 22:54:05 wiz Exp $");
+__RCSID("$NetBSD: ypserv.c,v 1.25 2011/08/30 17:06:22 plunky Exp $");
#endif
#include <sys/types.h>
@@ -155,85 +155,85 @@
switch (rqstp->rq_proc) {
case YPPROC_NULL:
- xdr_argument = xdr_void;
- xdr_result = xdr_void;
+ xdr_argument = (xdrproc_t)xdr_void;
+ xdr_result = (xdrproc_t)xdr_void;
local = ypproc_null_2_svc;
SVCNAME("null_2");
break;
case YPPROC_DOMAIN:
- xdr_argument = xdr_ypdomain_wrap_string;
- xdr_result = xdr_bool;
+ xdr_argument = (xdrproc_t)xdr_ypdomain_wrap_string;
+ xdr_result = (xdrproc_t)xdr_bool;
local = ypproc_domain_2_svc;
SVCNAME("domain_2");
break;
case YPPROC_DOMAIN_NONACK:
- xdr_argument = xdr_ypdomain_wrap_string;
- xdr_result = xdr_bool;
+ xdr_argument = (xdrproc_t)xdr_ypdomain_wrap_string;
+ xdr_result = (xdrproc_t)xdr_bool;
local = ypproc_domain_nonack_2_svc;
SVCNAME("domain_nonack_2");
break;
case YPPROC_MATCH:
- xdr_argument = xdr_ypreq_key;
- xdr_result = xdr_ypresp_val;
+ xdr_argument = (xdrproc_t)xdr_ypreq_key;
+ xdr_result = (xdrproc_t)xdr_ypresp_val;
local = ypproc_match_2_svc;
SVCNAME("match_2");
break;
case YPPROC_FIRST:
- xdr_argument = xdr_ypreq_nokey;
- xdr_result = xdr_ypresp_key_val;
+ xdr_argument = (xdrproc_t)xdr_ypreq_nokey;
+ xdr_result = (xdrproc_t)xdr_ypresp_key_val;
local = ypproc_first_2_svc;
SVCNAME("first_2");
break;
case YPPROC_NEXT:
- xdr_argument = xdr_ypreq_key;
- xdr_result = xdr_ypresp_key_val;
+ xdr_argument = (xdrproc_t)xdr_ypreq_key;
+ xdr_result = (xdrproc_t)xdr_ypresp_key_val;
local = ypproc_next_2_svc;
SVCNAME("next_2");
break;
case YPPROC_XFR:
- xdr_argument = xdr_ypreq_xfr;
- xdr_result = xdr_ypresp_xfr;
+ xdr_argument = (xdrproc_t)xdr_ypreq_xfr;
+ xdr_result = (xdrproc_t)xdr_ypresp_xfr;
local = ypproc_xfr_2_svc;
SVCNAME("xfer_2");
break;
case YPPROC_CLEAR:
- xdr_argument = xdr_void;
- xdr_result = xdr_void;
+ xdr_argument = (xdrproc_t)xdr_void;
+ xdr_result = (xdrproc_t)xdr_void;
local = ypproc_clear_2_svc;
SVCNAME("clear_2");
break;
case YPPROC_ALL:
- xdr_argument = xdr_ypreq_nokey;
- xdr_result = xdr_ypresp_all;
+ xdr_argument = (xdrproc_t)xdr_ypreq_nokey;
+ xdr_result = (xdrproc_t)xdr_ypresp_all;
local = ypproc_all_2_svc;
SVCNAME("all_2");
break;
case YPPROC_MASTER:
- xdr_argument = xdr_ypreq_nokey;
- xdr_result = xdr_ypresp_master;
+ xdr_argument = (xdrproc_t)xdr_ypreq_nokey;
+ xdr_result = (xdrproc_t)xdr_ypresp_master;
local = ypproc_master_2_svc;
SVCNAME("master_2");
break;
case YPPROC_ORDER:
- xdr_argument = xdr_ypreq_nokey;
- xdr_result = xdr_ypresp_order;
+ xdr_argument = (xdrproc_t)xdr_ypreq_nokey;
+ xdr_result = (xdrproc_t)xdr_ypresp_order;
local = ypproc_order_2_svc;
SVCNAME("order_2");
break;
case YPPROC_MAPLIST:
- xdr_argument = xdr_ypdomain_wrap_string;
- xdr_result = xdr_ypresp_maplist;
+ xdr_argument = (xdrproc_t)xdr_ypdomain_wrap_string;
+ xdr_result = (xdrproc_t)xdr_ypresp_maplist;
local = ypproc_maplist_2_svc;
SVCNAME("maplist_2");
break;
Index: src/usr.sbin/ypserv/ypserv/ypserv_proc.c
diff -u src/usr.sbin/ypserv/ypserv/ypserv_proc.c:1.15 src/usr.sbin/ypserv/ypserv/ypserv_proc.c:1.16
--- src/usr.sbin/ypserv/ypserv/ypserv_proc.c:1.15 Fri Jul 1 03:09:29 2011
+++ src/usr.sbin/ypserv/ypserv/ypserv_proc.c Tue Aug 30 17:06:22 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ypserv_proc.c,v 1.15 2011/07/01 03:09:29 joerg Exp $ */
+/* $NetBSD: ypserv_proc.c,v 1.16 2011/08/30 17:06:22 plunky Exp $ */
/*
* Copyright (c) 1994 Mats O Jansson <m...@stacken.kth.se>
@@ -28,7 +28,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: ypserv_proc.c,v 1.15 2011/07/01 03:09:29 joerg Exp $");
+__RCSID("$NetBSD: ypserv_proc.c,v 1.16 2011/08/30 17:06:22 plunky Exp $");
#endif
#include <sys/stat.h>
@@ -337,7 +337,7 @@
case 0:
/* CHILD: send result, then exit */
- if (!svc_sendreply(rqstp->rq_xprt, ypdb_xdr_get_all, (void *)k))
+ if (!svc_sendreply(rqstp->rq_xprt, (xdrproc_t)ypdb_xdr_get_all, (void *)k))
svcerr_systemerr(rqstp->rq_xprt);
/* Note: no need to free args; we're exiting. */
