Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src Apply casts to cases where xdrproc_t is expected but is not



details:   https://anonhg.NetBSD.org/src/rev/950c47f3544b
branches:  trunk
changeset: 769038:950c47f3544b
user:      plunky <plunky%NetBSD.org@localhost>
date:      Tue Aug 30 17:06:20 2011 +0000

description:
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.

diffstat:

 include/rpc/clnt.h                      |  12 ++++---
 include/rpc/svc.h                       |  10 +++---
 lib/libquota/getnfsquota.c              |  12 +++---
 lib/librpcsvc/rnusers.x                 |  12 ++++---
 libexec/rpc.rquotad/rquotad.c           |  10 +++---
 libexec/rpc.rstatd/rstat_proc.c         |   6 +-
 libexec/rpc.rusersd/rusers_proc.c       |   6 +-
 libexec/rpc.rwalld/rwalld.c             |   6 +-
 libexec/rpc.sprayd/sprayd.c             |   8 ++--
 tests/fs/nfs/nfsservice/mountd.c        |  24 +++++++-------
 usr.bin/rup/rup.c                       |   6 +-
 usr.bin/rusers/rusers.c                 |   9 +++--
 usr.bin/showmount/showmount.c           |  12 +++---
 usr.bin/ypwhich/ypwhich.c               |   4 +-
 usr.sbin/mountd/mountd.c                |  27 ++++++++--------
 usr.sbin/rpc.lockd/lockd_lock.c         |   7 ++-
 usr.sbin/rpc.yppasswdd/rpc.yppasswdd.c  |   6 +-
 usr.sbin/rpc.yppasswdd/yppasswdd_mkpw.c |   6 +-
 usr.sbin/ypbind/ypbind.c                |  28 ++++++++--------
 usr.sbin/yppoll/yppoll.c                |   8 ++--
 usr.sbin/ypserv/common/yplib_host.c     |  14 ++++----
 usr.sbin/ypserv/yppush/yppush_svc.c     |  12 +++---
 usr.sbin/ypserv/ypserv/ypserv.c         |  52 ++++++++++++++++----------------
 usr.sbin/ypserv/ypserv/ypserv_proc.c    |   6 +-
 24 files changed, 155 insertions(+), 148 deletions(-)

diffs (truncated from 1106 to 300 lines):

diff -r 8306494b6be8 -r 950c47f3544b include/rpc/clnt.h
--- a/include/rpc/clnt.h        Tue Aug 30 16:06:20 2011 +0000
+++ b/include/rpc/clnt.h        Tue Aug 30 17:06:20 2011 +0000
@@ -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
diff -r 8306494b6be8 -r 950c47f3544b include/rpc/svc.h
--- a/include/rpc/svc.h Tue Aug 30 16:06:20 2011 +0000
+++ b/include/rpc/svc.h Tue Aug 30 17:06:20 2011 +0000
@@ -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)
diff -r 8306494b6be8 -r 950c47f3544b lib/libquota/getnfsquota.c
--- a/lib/libquota/getnfsquota.c        Tue Aug 30 16:06:20 2011 +0000
+++ b/lib/libquota/getnfsquota.c        Tue Aug 30 17:06:20 2011 +0000
@@ -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);
 
diff -r 8306494b6be8 -r 950c47f3544b lib/librpcsvc/rnusers.x
--- a/lib/librpcsvc/rnusers.x   Tue Aug 30 16:06:20 2011 +0000
+++ b/lib/librpcsvc/rnusers.x   Tue Aug 30 17:06:20 2011 +0000
@@ -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);
 %}
diff -r 8306494b6be8 -r 950c47f3544b libexec/rpc.rquotad/rquotad.c
--- a/libexec/rpc.rquotad/rquotad.c     Tue Aug 30 16:06:20 2011 +0000
+++ b/libexec/rpc.rquotad/rquotad.c     Tue Aug 30 17:06:20 2011 +0000
@@ -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 (bouyer%ensta.fr@localhost). 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");
diff -r 8306494b6be8 -r 950c47f3544b libexec/rpc.rstatd/rstat_proc.c
--- a/libexec/rpc.rstatd/rstat_proc.c   Tue Aug 30 16:06:20 2011 +0000
+++ b/libexec/rpc.rstatd/rstat_proc.c   Tue Aug 30 17:06:20 2011 +0000
@@ -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:
diff -r 8306494b6be8 -r 950c47f3544b libexec/rpc.rusersd/rusers_proc.c
--- a/libexec/rpc.rusersd/rusers_proc.c Tue Aug 30 16:06:20 2011 +0000
+++ b/libexec/rpc.rusersd/rusers_proc.c Tue Aug 30 17:06:20 2011 +0000
@@ -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:
diff -r 8306494b6be8 -r 950c47f3544b libexec/rpc.rwalld/rwalld.c
--- a/libexec/rpc.rwalld/rwalld.c       Tue Aug 30 16:06:20 2011 +0000
+++ b/libexec/rpc.rwalld/rwalld.c       Tue Aug 30 17:06:20 2011 +0000
@@ -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:
diff -r 8306494b6be8 -r 950c47f3544b libexec/rpc.sprayd/sprayd.c
--- a/libexec/rpc.sprayd/sprayd.c       Tue Aug 30 16:06:20 2011 +0000
+++ b/libexec/rpc.sprayd/sprayd.c       Tue Aug 30 17:06:20 2011 +0000
@@ -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;
 



Home | Main Index | Thread Index | Old Index