Module Name: src
Committed By: dholland
Date: Sat Jan 23 02:34:09 UTC 2016
Modified Files:
src/include/rpc: auth.h auth_unix.h clnt.h clnt_soc.h pmap_clnt.h
rpcb_prot.x svc.h svc_soc.h xdr.h
Log Message:
unsigned -> unsigned int in previous change to accomodate C++ boneheadedness.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/include/rpc/auth.h
cvs rdiff -u -r1.9 -r1.10 src/include/rpc/auth_unix.h
cvs rdiff -u -r1.23 -r1.24 src/include/rpc/clnt.h
cvs rdiff -u -r1.4 -r1.5 src/include/rpc/clnt_soc.h
cvs rdiff -u -r1.12 -r1.13 src/include/rpc/pmap_clnt.h
cvs rdiff -u -r1.5 -r1.6 src/include/rpc/rpcb_prot.x
cvs rdiff -u -r1.30 -r1.31 src/include/rpc/svc.h
cvs rdiff -u -r1.3 -r1.4 src/include/rpc/svc_soc.h
cvs rdiff -u -r1.28 -r1.29 src/include/rpc/xdr.h
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/auth.h
diff -u src/include/rpc/auth.h:1.18 src/include/rpc/auth.h:1.19
--- src/include/rpc/auth.h:1.18 Sat Jan 23 01:05:30 2016
+++ src/include/rpc/auth.h Sat Jan 23 02:34:09 2016
@@ -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 @@ __END_DECLS
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 @@ struct sockaddr_in;
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 *);
Index: src/include/rpc/auth_unix.h
diff -u src/include/rpc/auth_unix.h:1.9 src/include/rpc/auth_unix.h:1.10
--- src/include/rpc/auth_unix.h:1.9 Sat Jan 23 01:05:30 2016
+++ src/include/rpc/auth_unix.h Sat Jan 23 02:34:09 2016
@@ -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 @@ struct authunix_parms {
char *aup_machname;
int aup_uid;
int aup_gid;
- unsigned aup_len;
+ unsigned int aup_len;
int *aup_gids;
};
Index: src/include/rpc/clnt.h
diff -u src/include/rpc/clnt.h:1.23 src/include/rpc/clnt.h:1.24
--- src/include/rpc/clnt.h:1.23 Sat Jan 23 01:05:30 2016
+++ src/include/rpc/clnt.h Sat Jan 23 02:34:09 2016
@@ -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 @@ typedef struct __rpc_client {
/* 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_tp_create(const char
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_tli_create(const int
*/
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_vc_create(const int,
*/
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
Index: src/include/rpc/clnt_soc.h
diff -u src/include/rpc/clnt_soc.h:1.4 src/include/rpc/clnt_soc.h:1.5
--- src/include/rpc/clnt_soc.h:1.4 Sat Jan 23 01:05:30 2016
+++ src/include/rpc/clnt_soc.h Sat Jan 23 02:34:09 2016
@@ -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 @@ extern CLIENT *clnttcp_create(struct soc
unsigned long,
unsigned long,
int *,
- unsigned,
- unsigned);
+ unsigned int,
+ unsigned int);
__END_DECLS
/*
@@ -110,8 +110,8 @@ extern CLIENT *clntudp_bufcreate(struct
unsigned long,
struct timeval,
int *,
- unsigned,
- unsigned);
+ unsigned int,
+ unsigned int);
__END_DECLS
#endif /* _RPC_CLNT_SOC_H */
Index: src/include/rpc/pmap_clnt.h
diff -u src/include/rpc/pmap_clnt.h:1.12 src/include/rpc/pmap_clnt.h:1.13
--- src/include/rpc/pmap_clnt.h:1.12 Sat Jan 23 01:05:30 2016
+++ src/include/rpc/pmap_clnt.h Sat Jan 23 02:34:09 2016
@@ -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 @@ extern enum clnt_stat clnt_broadcast(uns
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_ */
Index: src/include/rpc/rpcb_prot.x
diff -u src/include/rpc/rpcb_prot.x:1.5 src/include/rpc/rpcb_prot.x:1.6
--- src/include/rpc/rpcb_prot.x:1.5 Sat Jan 23 01:05:30 2016
+++ src/include/rpc/rpcb_prot.x Sat Jan 23 02:34:09 2016
@@ -207,7 +207,7 @@ struct rpcb_rmtcallargs {
% 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 */
Index: src/include/rpc/svc.h
diff -u src/include/rpc/svc.h:1.30 src/include/rpc/svc.h:1.31
--- src/include/rpc/svc.h:1.30 Sat Jan 23 01:05:30 2016
+++ src/include/rpc/svc.h Sat Jan 23 02:34:09 2016
@@ -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 @@ typedef struct __rpc_svcxprt {
/* 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 @@ extern SVCXPRT *svc_tp_create(void (*)(s
* 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 @@ extern SVCXPRT *svc_tli_create(const int
* 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 @@ extern SVCXPRT *svc_dg_create(const int,
* 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 @@ extern SVCXPRT *svc_raw_create(void);
/*
* 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
Index: src/include/rpc/svc_soc.h
diff -u src/include/rpc/svc_soc.h:1.3 src/include/rpc/svc_soc.h:1.4
--- src/include/rpc/svc_soc.h:1.3 Sat Jan 23 01:05:30 2016
+++ src/include/rpc/svc_soc.h Sat Jan 23 02:34:09 2016
@@ -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 @@ __END_DECLS
*/
__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 @@ __END_DECLS
* 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 */
Index: src/include/rpc/xdr.h
diff -u src/include/rpc/xdr.h:1.28 src/include/rpc/xdr.h:1.29
--- src/include/rpc/xdr.h:1.28 Sat Jan 23 01:05:30 2016
+++ src/include/rpc/xdr.h Sat Jan 23 02:34:09 2016
@@ -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 @@ typedef struct __rpc_xdr {
/* 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 @@ typedef struct __rpc_xdr {
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;
/*
@@ -280,7 +280,7 @@ struct xdr_discrim {
__BEGIN_DECLS
extern bool_t xdr_void(void);
extern bool_t xdr_int(XDR *, int *);
-extern bool_t xdr_u_int(XDR *, unsigned *);
+extern bool_t xdr_u_int(XDR *, unsigned int *);
extern bool_t xdr_long(XDR *, long *);
extern bool_t xdr_u_long(XDR *, unsigned long *);
extern bool_t xdr_short(XDR *, short *);
@@ -293,19 +293,21 @@ extern bool_t xdr_int64_t(XDR *, int64_t
extern bool_t xdr_u_int64_t(XDR *, uint64_t *);
extern bool_t xdr_bool(XDR *, bool_t *);
extern bool_t xdr_enum(XDR *, enum_t *);
-extern bool_t xdr_array(XDR *, char **, unsigned *, unsigned, unsigned, xdrproc_t);
-extern bool_t xdr_bytes(XDR *, char **, unsigned *, unsigned);
-extern bool_t xdr_opaque(XDR *, char *, unsigned);
-extern bool_t xdr_string(XDR *, char **, unsigned);
+extern bool_t xdr_array(XDR *, char **, unsigned int *, unsigned int,
+ unsigned int, xdrproc_t);
+extern bool_t xdr_bytes(XDR *, char **, unsigned int *, unsigned int);
+extern bool_t xdr_opaque(XDR *, char *, unsigned int);
+extern bool_t xdr_string(XDR *, char **, unsigned int);
extern bool_t xdr_union(XDR *, enum_t *, char *, const struct xdr_discrim *, xdrproc_t);
extern bool_t xdr_char(XDR *, char *);
extern bool_t xdr_u_char(XDR *, unsigned char *);
-extern bool_t xdr_vector(XDR *, char *, unsigned, unsigned, xdrproc_t);
+extern bool_t xdr_vector(XDR *, char *, unsigned int, unsigned int,
+ xdrproc_t);
extern bool_t xdr_float(XDR *, float *);
extern bool_t xdr_double(XDR *, double *);
extern bool_t xdr_quadruple(XDR *, long double *);
-extern bool_t xdr_reference(XDR *, char **, unsigned, xdrproc_t);
-extern bool_t xdr_pointer(XDR *, char **, unsigned, xdrproc_t);
+extern bool_t xdr_reference(XDR *, char **, unsigned int, xdrproc_t);
+extern bool_t xdr_pointer(XDR *, char **, unsigned int, xdrproc_t);
extern bool_t xdr_wrapstring(XDR *, char **);
extern void xdr_free(xdrproc_t, char *);
extern bool_t xdr_hyper(XDR *, longlong_t *);
@@ -321,7 +323,7 @@ __END_DECLS
*/
#define MAX_NETOBJ_SZ 1024
struct netobj {
- unsigned n_len;
+ unsigned int n_len;
char *n_bytes;
};
typedef struct netobj netobj;
@@ -333,7 +335,7 @@ extern bool_t xdr_netobj(XDR *, struct
*/
__BEGIN_DECLS
/* XDR using memory buffers */
-extern void xdrmem_create(XDR *, char *, unsigned, enum xdr_op);
+extern void xdrmem_create(XDR *, char *, unsigned int, enum xdr_op);
/* XDR using stdio library */
#ifdef _STDIO_H_
@@ -341,7 +343,7 @@ extern void xdrstdio_create(XDR *, FIL
#endif
/* XDR pseudo records for tcp */
-extern void xdrrec_create(XDR *, unsigned, unsigned, char *,
+extern void xdrrec_create(XDR *, unsigned int, unsigned int, char *,
int (*)(char *, char *, int),
int (*)(char *, char *, int));
@@ -353,7 +355,7 @@ extern bool_t xdrrec_skiprecord(XDR *);
/* true if no more input */
extern bool_t xdrrec_eof(XDR *);
-extern unsigned xdrrec_readbytes(XDR *, caddr_t, unsigned);
+extern unsigned xdrrec_readbytes(XDR *, caddr_t, unsigned int);
__END_DECLS
#endif /* !_RPC_XDR_H_ */
