Source-Changes-HG archive

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

[src/trunk]: src/include/rpc unsigned -> unsigned int in previous change to a...



details:   https://anonhg.NetBSD.org/src/rev/c9018f8c79b2
branches:  trunk
changeset: 343127:c9018f8c79b2
user:      dholland <dholland%NetBSD.org@localhost>
date:      Sat Jan 23 02:34:09 2016 +0000

description:
unsigned -> unsigned int in previous change to accomodate C++ boneheadedness.

diffstat:

 include/rpc/auth.h      |   6 +++---
 include/rpc/auth_unix.h |   4 ++--
 include/rpc/clnt.h      |  14 +++++++-------
 include/rpc/clnt_soc.h  |  10 +++++-----
 include/rpc/pmap_clnt.h |   6 +++---
 include/rpc/rpcb_prot.x |   2 +-
 include/rpc/svc.h       |  21 ++++++++++++---------
 include/rpc/svc_soc.h   |   8 ++++----
 include/rpc/xdr.h       |  38 ++++++++++++++++++++------------------
 9 files changed, 57 insertions(+), 52 deletions(-)

diffs (truncated from 375 to 300 lines):

diff -r 824b27e2b0ec -r c9018f8c79b2 include/rpc/auth.h
--- a/include/rpc/auth.h        Sat Jan 23 02:33:09 2016 +0000
+++ b/include/rpc/auth.h        Sat Jan 23 02:34:09 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: auth.h,v 1.18 2016/01/23 01:05:30 dholland Exp $       */
+/*     $NetBSD: auth.h,v 1.19 2016/01/23 02:34:09 dholland Exp $       */
 
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -87,7 +87,7 @@
 struct opaque_auth {
        enum_t  oa_flavor;              /* flavor of auth */
        caddr_t oa_base;                /* address of more auth stuff */
-       unsigned oa_length;             /* not to exceed MAX_AUTH_BYTES */
+       unsigned int oa_length;         /* not to exceed MAX_AUTH_BYTES */
 };
 
 
@@ -169,7 +169,7 @@
 extern AUTH *authunix_create           (char *, int, int, int, int *);
 extern AUTH *authunix_create_default   (void);
 extern AUTH *authnone_create           (void);
-extern AUTH *authdes_create            (char *, unsigned,
+extern AUTH *authdes_create            (char *, unsigned int,
                                            struct sockaddr_in *, des_block *);
 extern bool_t xdr_opaque_auth          (XDR *, struct opaque_auth *);
 
diff -r 824b27e2b0ec -r c9018f8c79b2 include/rpc/auth_unix.h
--- a/include/rpc/auth_unix.h   Sat Jan 23 02:33:09 2016 +0000
+++ b/include/rpc/auth_unix.h   Sat Jan 23 02:34:09 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: auth_unix.h,v 1.9 2016/01/23 01:05:30 dholland Exp $   */
+/*     $NetBSD: auth_unix.h,v 1.10 2016/01/23 02:34:09 dholland Exp $  */
 
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -63,7 +63,7 @@
        char    *aup_machname;
        int      aup_uid;
        int      aup_gid;
-       unsigned aup_len;
+       unsigned int aup_len;
        int     *aup_gids;
 };
 
diff -r 824b27e2b0ec -r c9018f8c79b2 include/rpc/clnt.h
--- a/include/rpc/clnt.h        Sat Jan 23 02:33:09 2016 +0000
+++ b/include/rpc/clnt.h        Sat Jan 23 02:34:09 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: clnt.h,v 1.23 2016/01/23 01:05:30 dholland Exp $       */
+/*     $NetBSD: clnt.h,v 1.24 2016/01/23 02:34:09 dholland Exp $       */
 
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -156,8 +156,8 @@
                /* destroy this structure */
                void            (*cl_destroy)(struct __rpc_client *);
                /* the ioctl() of rpc */
-               bool_t          (*cl_control)(struct __rpc_client *, unsigned,
-                                   char *);
+               bool_t          (*cl_control)(struct __rpc_client *,
+                                   unsigned int, char *);
        } *cl_ops;
        void                    *cl_private;    /* private stuff */
        char                    *cl_netid;      /* network token */
@@ -365,8 +365,8 @@
 
 extern CLIENT *clnt_tli_create(const int, const struct netconfig *,
                                    const struct netbuf *, const rpcprog_t,
-                                   const rpcvers_t, const unsigned,
-                                   const unsigned);
+                                   const rpcvers_t, const unsigned int,
+                                   const unsigned int);
 /*
  *     const register int fd;          -- fd
  *     const struct netconfig *nconf;  -- netconfig structure
@@ -382,7 +382,7 @@
  */
 extern CLIENT *clnt_vc_create(const int, const struct netbuf *,
                                   const rpcprog_t, const rpcvers_t,
-                                  const unsigned, const unsigned);
+                                  const unsigned int, const unsigned int);
 /*
  *     const int fd;                           -- open file descriptor
  *     const struct netbuf *svcaddr;           -- servers address
@@ -397,7 +397,7 @@
  */
 extern CLIENT *clnt_dg_create(const int, const struct netbuf *,
                                   const rpcprog_t, const rpcvers_t,
-                                  const unsigned, const unsigned);
+                                  const unsigned int, const unsigned int);
 /*
  *     const int fd;                           -- open file descriptor
  *     const struct netbuf *svcaddr;           -- servers address
diff -r 824b27e2b0ec -r c9018f8c79b2 include/rpc/clnt_soc.h
--- a/include/rpc/clnt_soc.h    Sat Jan 23 02:33:09 2016 +0000
+++ b/include/rpc/clnt_soc.h    Sat Jan 23 02:34:09 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: clnt_soc.h,v 1.4 2016/01/23 01:05:30 dholland Exp $    */
+/*     $NetBSD: clnt_soc.h,v 1.5 2016/01/23 02:34:09 dholland Exp $    */
 
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -66,8 +66,8 @@
                                unsigned long,
                                unsigned long,
                                int *,
-                               unsigned,
-                               unsigned);
+                               unsigned int,
+                               unsigned int);
 __END_DECLS
 
 /*
@@ -110,8 +110,8 @@
                                     unsigned long,
                                     struct timeval,
                                     int *,
-                                    unsigned,
-                                    unsigned);
+                                    unsigned int,
+                                    unsigned int);
 __END_DECLS
 
 #endif /* _RPC_CLNT_SOC_H */
diff -r 824b27e2b0ec -r c9018f8c79b2 include/rpc/pmap_clnt.h
--- a/include/rpc/pmap_clnt.h   Sat Jan 23 02:33:09 2016 +0000
+++ b/include/rpc/pmap_clnt.h   Sat Jan 23 02:34:09 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pmap_clnt.h,v 1.12 2016/01/23 01:05:30 dholland Exp $  */
+/*     $NetBSD: pmap_clnt.h,v 1.13 2016/01/23 02:34:09 dholland Exp $  */
 
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -83,9 +83,9 @@
                                        xdrproc_t, char *,
                                        xdrproc_t, char *,
                                        resultproc_t);
-extern u_short         pmap_getport(struct sockaddr_in *,
+extern unsigned short  pmap_getport(struct sockaddr_in *,
                                        unsigned long, unsigned long,
-                                       unsigned);
+                                       unsigned int);
 __END_DECLS
 
 #endif /* !_RPC_PMAP_CLNT_H_ */
diff -r 824b27e2b0ec -r c9018f8c79b2 include/rpc/rpcb_prot.x
--- a/include/rpc/rpcb_prot.x   Sat Jan 23 02:33:09 2016 +0000
+++ b/include/rpc/rpcb_prot.x   Sat Jan 23 02:34:09 2016 +0000
@@ -207,7 +207,7 @@
 %      rpcvers_t vers;
 %      rpcproc_t proc;
 %      struct {
-%              unsigned args_len;
+%              unsigned int args_len;
 %              const char *args_val;
 %      } args;
 %      xdrproc_t       xdr_args;       /* encodes args */
diff -r 824b27e2b0ec -r c9018f8c79b2 include/rpc/svc.h
--- a/include/rpc/svc.h Sat Jan 23 02:33:09 2016 +0000
+++ b/include/rpc/svc.h Sat Jan 23 02:34:09 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: svc.h,v 1.30 2016/01/23 01:05:30 dholland Exp $        */
+/*     $NetBSD: svc.h,v 1.31 2016/01/23 02:34:09 dholland Exp $        */
 
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -108,8 +108,8 @@
        /* XXX - fvdl stick this here for ABI backward compat reasons */
        const struct xp_ops2 {
                /* catch-all function */
-               bool_t  (*xp_control)(struct __rpc_svcxprt *, const unsigned,
-                                          void *);
+               bool_t  (*xp_control)(struct __rpc_svcxprt *,
+                                          const unsigned int, void *);
        } *xp_ops2;
        char            *xp_tp;          /* transport provider device name */
        char            *xp_netid;       /* network token */
@@ -387,8 +387,8 @@
  * Generic TLI create routine
  */
 extern SVCXPRT *svc_tli_create(const int, const struct netconfig *,
-                                   const struct t_bind *, const unsigned,
-                                   const unsigned);
+                                   const struct t_bind *, const unsigned int,
+                                   const unsigned int);
 /*
  *     const int fd;                   -- connection end point
  *     const struct netconfig *nconf;  -- netconfig structure for network
@@ -401,14 +401,16 @@
  * Connectionless and connectionful create routines
  */
 
-extern SVCXPRT *svc_vc_create(const int, const unsigned, const unsigned);
+extern SVCXPRT *svc_vc_create(const int, const unsigned int,
+                               const unsigned int);
 /*
  *     const int fd;                   -- open connection end point
  *     const unsigned sendsize;        -- max send size
  *     const unsigned recvsize;        -- max recv size
  */
 
-extern SVCXPRT *svc_dg_create(const int, const unsigned, const unsigned);
+extern SVCXPRT *svc_dg_create(const int, const unsigned int,
+                               const unsigned int);
 /*
  *     const int fd;                   -- open connection
  *     const unsigned sendsize;        -- max send size
@@ -420,7 +422,8 @@
  * the routine takes any *open* connection
  * descriptor as its first input and is used for open connections.
  */
-extern SVCXPRT *svc_fd_create(const int, const unsigned, const unsigned);
+extern SVCXPRT *svc_fd_create(const int, const unsigned int,
+                               const unsigned int);
 /*
  *     const int fd;                   -- open connection end point
  *     const unsigned sendsize;        -- max send size
@@ -435,7 +438,7 @@
 /*
  * svc_dg_enable_cache() enables the cache on dg transports.
  */
-int svc_dg_enablecache(SVCXPRT *, const unsigned);
+int svc_dg_enablecache(SVCXPRT *, const unsigned int);
 
 __END_DECLS
 
diff -r 824b27e2b0ec -r c9018f8c79b2 include/rpc/svc_soc.h
--- a/include/rpc/svc_soc.h     Sat Jan 23 02:33:09 2016 +0000
+++ b/include/rpc/svc_soc.h     Sat Jan 23 02:34:09 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: svc_soc.h,v 1.3 2016/01/23 01:05:30 dholland Exp $     */
+/*     $NetBSD: svc_soc.h,v 1.4 2016/01/23 02:34:09 dholland Exp $     */
 
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -93,7 +93,7 @@
  */
 __BEGIN_DECLS
 extern SVCXPRT *svcudp_create(int);
-extern SVCXPRT *svcudp_bufcreate(int, unsigned, unsigned);
+extern SVCXPRT *svcudp_bufcreate(int, unsigned int, unsigned int);
 extern int svcudp_enablecache(SVCXPRT *, unsigned long);
 __END_DECLS
 
@@ -102,14 +102,14 @@
  * Tcp based rpc.
  */
 __BEGIN_DECLS
-extern SVCXPRT *svctcp_create(int, unsigned, unsigned);
+extern SVCXPRT *svctcp_create(int, unsigned int, unsigned int);
 __END_DECLS
 
 /*
  * Fd based rpc.
  */
 __BEGIN_DECLS
-extern SVCXPRT *svcfd_create(int, unsigned, unsigned);
+extern SVCXPRT *svcfd_create(int, unsigned int, unsigned int);
 __END_DECLS
 
 #endif /* !_RPC_SVC_SOC_H */
diff -r 824b27e2b0ec -r c9018f8c79b2 include/rpc/xdr.h
--- a/include/rpc/xdr.h Sat Jan 23 02:33:09 2016 +0000
+++ b/include/rpc/xdr.h Sat Jan 23 02:34:09 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: xdr.h,v 1.28 2016/01/23 01:05:30 dholland Exp $        */
+/*     $NetBSD: xdr.h,v 1.29 2016/01/23 02:34:09 dholland Exp $        */
 
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -104,16 +104,16 @@
                /* put a long to " */
                bool_t  (*x_putlong)(struct __rpc_xdr *, const long *);
                /* get some bytes from " */
-               bool_t  (*x_getbytes)(struct __rpc_xdr *, char *, unsigned);
+               bool_t  (*x_getbytes)(struct __rpc_xdr *, char *, unsigned int);
                /* put some bytes to " */
                bool_t  (*x_putbytes)(struct __rpc_xdr *, const char *,
-                                       unsigned);
+                                       unsigned int);
                /* returns bytes off from beginning */
                unsigned (*x_getpostn)(struct __rpc_xdr *);
                /* lets you reposition the stream */
-               bool_t  (*x_setpostn)(struct __rpc_xdr *, unsigned);
+               bool_t  (*x_setpostn)(struct __rpc_xdr *, unsigned int);
                /* buf quick ptr to buffered data */
-               int32_t *(*x_inline)(struct __rpc_xdr *, unsigned);
+               int32_t *(*x_inline)(struct __rpc_xdr *, unsigned int);
                /* free privates of this xdr_stream */
                void    (*x_destroy)(struct __rpc_xdr *);
                bool_t  (*x_control)(struct __rpc_xdr *, int, void *);
@@ -121,7 +121,7 @@
        char *          x_public;       /* users' data */
        void *          x_private;      /* pointer to private data */
        char *          x_base;         /* private used for position info */
-       unsigned        x_handy;        /* extra private word */
+       unsigned int    x_handy;        /* extra private word */
 } XDR;
 



Home | Main Index | Thread Index | Old Index