From owner-svn-src-user@FreeBSD.ORG Wed Nov 12 12:38:48 2008 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E9BD8106568C; Wed, 12 Nov 2008 12:38:48 +0000 (UTC) (envelope-from dfr@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id DF3988FC1C; Wed, 12 Nov 2008 12:38:48 +0000 (UTC) (envelope-from dfr@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id mACCcmCQ030522; Wed, 12 Nov 2008 12:38:48 GMT (envelope-from dfr@svn.freebsd.org) Received: (from dfr@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id mACCcmCt030519; Wed, 12 Nov 2008 12:38:48 GMT (envelope-from dfr@svn.freebsd.org) Message-Id: <200811121238.mACCcmCt030519@svn.freebsd.org> From: Doug Rabson Date: Wed, 12 Nov 2008 12:38:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r184880 - in user/dfr/gssapi/7/sys: . nlm rpc X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Nov 2008 12:38:49 -0000 Author: dfr Date: Wed Nov 12 12:38:48 2008 New Revision: 184880 URL: http://svn.freebsd.org/changeset/base/184880 Log: MFC: 182154 - rename struct pmap to avoid confusion. Modified: user/dfr/gssapi/7/sys/ (props changed) user/dfr/gssapi/7/sys/nlm/nlm_prot_impl.c user/dfr/gssapi/7/sys/rpc/pmap_prot.h user/dfr/gssapi/7/sys/rpc/rpcb_prot.c Modified: user/dfr/gssapi/7/sys/nlm/nlm_prot_impl.c ============================================================================== --- user/dfr/gssapi/7/sys/nlm/nlm_prot_impl.c Wed Nov 12 12:31:03 2008 (r184879) +++ user/dfr/gssapi/7/sys/nlm/nlm_prot_impl.c Wed Nov 12 12:38:48 2008 (r184880) @@ -301,7 +301,7 @@ nlm_get_rpc(struct sockaddr *sa, rpcprog enum clnt_stat stat = RPC_SUCCESS; int rpcvers = RPCBVERS4; bool_t do_tcp = FALSE; - struct pmap mapping; + struct portmap mapping; u_short port = 0; /* @@ -399,7 +399,7 @@ again: mapping.pm_port = 0; stat = CLNT_CALL(rpcb, (rpcprog_t) PMAPPROC_GETPORT, - (xdrproc_t) xdr_pmap, &mapping, + (xdrproc_t) xdr_portmap, &mapping, (xdrproc_t) xdr_u_short, &port, timo); if (stat == RPC_SUCCESS) { Modified: user/dfr/gssapi/7/sys/rpc/pmap_prot.h ============================================================================== --- user/dfr/gssapi/7/sys/rpc/pmap_prot.h Wed Nov 12 12:31:03 2008 (r184879) +++ user/dfr/gssapi/7/sys/rpc/pmap_prot.h Wed Nov 12 12:38:48 2008 (r184880) @@ -44,15 +44,15 @@ * PMAPPROC_NULL() returns () * takes nothing, returns nothing * - * PMAPPROC_SET(struct pmap) returns (bool_t) + * PMAPPROC_SET(struct portmap) returns (bool_t) * TRUE is success, FALSE is failure. Registers the tuple * [prog, vers, prot, port]. * - * PMAPPROC_UNSET(struct pmap) returns (bool_t) + * PMAPPROC_UNSET(struct portmap) returns (bool_t) * TRUE is success, FALSE is failure. Un-registers pair * [prog, vers]. prot and port are ignored. * - * PMAPPROC_GETPORT(struct pmap) returns (long unsigned). + * PMAPPROC_GETPORT(struct portmap) returns (long unsigned). * 0 is failure. Otherwise returns the port number where the pair * [prog, vers] is registered. It may lie! * @@ -86,7 +86,7 @@ #define PMAPPROC_DUMP ((u_long)4) #define PMAPPROC_CALLIT ((u_long)5) -struct pmap { +struct portmap { long unsigned pm_prog; long unsigned pm_vers; long unsigned pm_prot; @@ -94,12 +94,12 @@ struct pmap { }; struct pmaplist { - struct pmap pml_map; + struct portmap pml_map; struct pmaplist *pml_next; }; __BEGIN_DECLS -extern bool_t xdr_pmap(XDR *, struct pmap *); +extern bool_t xdr_portmap(XDR *, struct portmap *); extern bool_t xdr_pmaplist(XDR *, struct pmaplist **); extern bool_t xdr_pmaplist_ptr(XDR *, struct pmaplist *); __END_DECLS Modified: user/dfr/gssapi/7/sys/rpc/rpcb_prot.c ============================================================================== --- user/dfr/gssapi/7/sys/rpc/rpcb_prot.c Wed Nov 12 12:31:03 2008 (r184879) +++ user/dfr/gssapi/7/sys/rpc/rpcb_prot.c Wed Nov 12 12:38:48 2008 (r184880) @@ -56,7 +56,7 @@ __FBSDID("$FreeBSD$"); #include bool_t -xdr_pmap(XDR *xdrs, struct pmap *regs) +xdr_portmap(XDR *xdrs, struct portmap *regs) { if (xdr_u_long(xdrs, ®s->pm_prog) &&