Module Name: src
Committed By: dholland
Date: Sat Jan 23 01:05:31 UTC 2016
Modified Files:
src/include/rpc: auth.h auth_unix.h clnt.h clnt_soc.h pmap_clnt.h rpc.h
rpcb_prot.x svc.h svc_soc.h xdr.h
Log Message:
u_int -> unsigned, u_long -> unsigned long, etc.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/include/rpc/auth.h
cvs rdiff -u -r1.8 -r1.9 src/include/rpc/auth_unix.h
cvs rdiff -u -r1.22 -r1.23 src/include/rpc/clnt.h
cvs rdiff -u -r1.3 -r1.4 src/include/rpc/clnt_soc.h
cvs rdiff -u -r1.11 -r1.12 src/include/rpc/pmap_clnt.h
cvs rdiff -u -r1.15 -r1.16 src/include/rpc/rpc.h
cvs rdiff -u -r1.4 -r1.5 src/include/rpc/rpcb_prot.x
cvs rdiff -u -r1.29 -r1.30 src/include/rpc/svc.h
cvs rdiff -u -r1.2 -r1.3 src/include/rpc/svc_soc.h
cvs rdiff -u -r1.27 -r1.28 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.17 src/include/rpc/auth.h:1.18
--- src/include/rpc/auth.h:1.17 Mon Dec 26 19:01:47 2005
+++ src/include/rpc/auth.h Sat Jan 23 01:05:30 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: auth.h,v 1.17 2005/12/26 19:01:47 perry Exp $ */
+/* $NetBSD: auth.h,v 1.18 2016/01/23 01:05:30 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 */
- u_int oa_length; /* not to exceed MAX_AUTH_BYTES */
+ unsigned 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 *, u_int,
+extern AUTH *authdes_create (char *, unsigned,
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.8 src/include/rpc/auth_unix.h:1.9
--- src/include/rpc/auth_unix.h:1.8 Thu Feb 3 04:39:32 2005
+++ src/include/rpc/auth_unix.h Sat Jan 23 01:05:30 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: auth_unix.h,v 1.8 2005/02/03 04:39:32 perry Exp $ */
+/* $NetBSD: auth_unix.h,v 1.9 2016/01/23 01:05:30 dholland Exp $ */
/*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -59,11 +59,11 @@
* Unix style credentials.
*/
struct authunix_parms {
- u_long aup_time;
+ unsigned long aup_time;
char *aup_machname;
int aup_uid;
int aup_gid;
- u_int aup_len;
+ unsigned aup_len;
int *aup_gids;
};
Index: src/include/rpc/clnt.h
diff -u src/include/rpc/clnt.h:1.22 src/include/rpc/clnt.h:1.23
--- src/include/rpc/clnt.h:1.22 Fri Jun 6 14:31:24 2014
+++ src/include/rpc/clnt.h Sat Jan 23 01:05:30 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: clnt.h,v 1.22 2014/06/06 14:31:24 christos Exp $ */
+/* $NetBSD: clnt.h,v 1.23 2016/01/23 01:05:30 dholland Exp $ */
/*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -156,7 +156,7 @@ typedef struct __rpc_client {
/* destroy this structure */
void (*cl_destroy)(struct __rpc_client *);
/* the ioctl() of rpc */
- bool_t (*cl_control)(struct __rpc_client *, u_int,
+ bool_t (*cl_control)(struct __rpc_client *, unsigned,
char *);
} *cl_ops;
void *cl_private; /* private stuff */
@@ -169,9 +169,9 @@ typedef struct __rpc_client {
* Timers used for the pseudo-transport protocol when using datagrams
*/
struct rpc_timers {
- u_short rt_srtt; /* smoothed round-trip time */
- u_short rt_deviate; /* estimated deviation */
- u_long rt_rtxcur; /* current (backed-off) rto */
+ unsigned short rt_srtt; /* smoothed round-trip time */
+ unsigned short rt_deviate; /* estimated deviation */
+ unsigned long rt_rtxcur; /* current (backed-off) rto */
};
/*
@@ -245,7 +245,7 @@ struct rpc_timers {
* bool_t
* CLNT_CONTROL(cl, request, info)
* CLIENT *cl;
- * u_int request;
+ * unsigned request;
* char *info;
*/
#define CLNT_CONTROL(cl,rq,in) ((*(cl)->cl_ops->cl_control)(cl,rq,in))
@@ -365,15 +365,16 @@ 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 u_int, const u_int);
+ const rpcvers_t, const unsigned,
+ const unsigned);
/*
* const register int fd; -- fd
* const struct netconfig *nconf; -- netconfig structure
* const struct netbuf *svcaddr; -- servers address
- * const u_long prog; -- program number
- * const u_long vers; -- version number
- * const u_int sendsz; -- send size
- * const u_int recvsz; -- recv size
+ * const unsigned long prog; -- program number
+ * const unsigned long vers; -- version number
+ * const unsigned sendsz; -- send size
+ * const unsigned recvsz; -- recv size
*/
/*
@@ -381,14 +382,14 @@ extern CLIENT *clnt_tli_create(const int
*/
extern CLIENT *clnt_vc_create(const int, const struct netbuf *,
const rpcprog_t, const rpcvers_t,
- const u_int, const u_int);
+ const unsigned, const unsigned);
/*
* const int fd; -- open file descriptor
* const struct netbuf *svcaddr; -- servers address
* const rpcprog_t prog; -- program number
* const rpcvers_t vers; -- version number
- * const u_int sendsz; -- buffer recv size
- * const u_int recvsz; -- buffer send size
+ * const unsigned sendsz; -- buffer recv size
+ * const unsigned recvsz; -- buffer send size
*/
/*
@@ -396,22 +397,22 @@ extern CLIENT *clnt_vc_create(const int,
*/
extern CLIENT *clnt_dg_create(const int, const struct netbuf *,
const rpcprog_t, const rpcvers_t,
- const u_int, const u_int);
+ const unsigned, const unsigned);
/*
* const int fd; -- open file descriptor
* const struct netbuf *svcaddr; -- servers address
* const rpcprog_t program; -- program number
* const rpcvers_t version; -- version number
- * const u_int sendsz; -- buffer recv size
- * const u_int recvsz; -- buffer send size
+ * const unsigned sendsz; -- buffer recv size
+ * const unsigned recvsz; -- buffer send size
*/
/*
* Memory based rpc (for speed check and testing)
* CLIENT *
* clnt_raw_create(prog, vers)
- * u_long prog;
- * u_long vers;
+ * unsigned long prog;
+ * unsigned long vers;
*/
extern CLIENT *clnt_raw_create (rpcprog_t, rpcvers_t);
Index: src/include/rpc/clnt_soc.h
diff -u src/include/rpc/clnt_soc.h:1.3 src/include/rpc/clnt_soc.h:1.4
--- src/include/rpc/clnt_soc.h:1.3 Sun Feb 6 04:40:51 2005
+++ src/include/rpc/clnt_soc.h Sat Jan 23 01:05:30 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: clnt_soc.h,v 1.3 2005/02/06 04:40:51 perry Exp $ */
+/* $NetBSD: clnt_soc.h,v 1.4 2016/01/23 01:05:30 dholland Exp $ */
/*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -55,26 +55,26 @@
* CLIENT *
* clnttcp_create(raddr, prog, vers, sockp, sendsz, recvsz)
* struct sockaddr_in *raddr;
- * u_long prog;
- * u_long version;
+ * unsigned long prog;
+ * unsigned long version;
* int *sockp;
- * u_int sendsz;
- * u_int recvsz;
+ * unsigned sendsz;
+ * unsigned recvsz;
*/
__BEGIN_DECLS
extern CLIENT *clnttcp_create(struct sockaddr_in *,
- u_long,
- u_long,
+ unsigned long,
+ unsigned long,
int *,
- u_int,
- u_int);
+ unsigned,
+ unsigned);
__END_DECLS
/*
* Raw (memory) rpc.
*/
__BEGIN_DECLS
-extern CLIENT *clntraw_create (u_long, u_long);
+extern CLIENT *clntraw_create (unsigned long, unsigned long);
__END_DECLS
@@ -83,8 +83,8 @@ __END_DECLS
* CLIENT *
* clntudp_create(raddr, program, version, wait, sockp)
* struct sockaddr_in *raddr;
- * u_long program;
- * u_long version;
+ * unsigned long program;
+ * unsigned long version;
* struct timeval wait;
* int *sockp;
*
@@ -92,26 +92,26 @@ __END_DECLS
* CLIENT *
* clntudp_bufcreate(raddr, program, version, wait, sockp, sendsz, recvsz)
* struct sockaddr_in *raddr;
- * u_long program;
- * u_long version;
+ * unsigned long program;
+ * unsigned long version;
* struct timeval wait;
* int *sockp;
- * u_int sendsz;
- * u_int recvsz;
+ * unsigned sendsz;
+ * unsigned recvsz;
*/
__BEGIN_DECLS
extern CLIENT *clntudp_create(struct sockaddr_in *,
- u_long,
- u_long,
+ unsigned long,
+ unsigned long,
struct timeval,
int *);
extern CLIENT *clntudp_bufcreate(struct sockaddr_in *,
- u_long,
- u_long,
+ unsigned long,
+ unsigned long,
struct timeval,
int *,
- u_int,
- u_int);
+ unsigned,
+ unsigned);
__END_DECLS
#endif /* _RPC_CLNT_SOC_H */
Index: src/include/rpc/pmap_clnt.h
diff -u src/include/rpc/pmap_clnt.h:1.11 src/include/rpc/pmap_clnt.h:1.12
--- src/include/rpc/pmap_clnt.h:1.11 Sun Jan 11 03:04:12 2009
+++ src/include/rpc/pmap_clnt.h Sat Jan 23 01:05:30 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap_clnt.h,v 1.11 2009/01/11 03:04:12 christos Exp $ */
+/* $NetBSD: pmap_clnt.h,v 1.12 2016/01/23 01:05:30 dholland Exp $ */
/*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -66,23 +66,26 @@
#include <sys/cdefs.h>
__BEGIN_DECLS
-extern bool_t pmap_set(u_long, u_long, int, int);
-extern bool_t pmap_unset(u_long, u_long);
+extern bool_t pmap_set(unsigned long, unsigned long, int, int);
+extern bool_t pmap_unset(unsigned long, unsigned long);
extern struct pmaplist *pmap_getmaps(struct sockaddr_in *);
#ifndef __LIBC12_SOURCE__
extern enum clnt_stat pmap_rmtcall(struct sockaddr_in *,
- u_long, u_long, u_long,
+ unsigned long, unsigned long,
+ unsigned long,
xdrproc_t, caddr_t,
xdrproc_t, caddr_t,
- struct timeval, u_long *)
+ struct timeval, unsigned long *)
__RENAME(__pmap_rmtcall50);
#endif
-extern enum clnt_stat clnt_broadcast(u_long, u_long, u_long,
+extern enum clnt_stat clnt_broadcast(unsigned long, unsigned long,
+ unsigned long,
xdrproc_t, char *,
xdrproc_t, char *,
resultproc_t);
extern u_short pmap_getport(struct sockaddr_in *,
- u_long, u_long, u_int);
+ unsigned long, unsigned long,
+ unsigned);
__END_DECLS
#endif /* !_RPC_PMAP_CLNT_H_ */
Index: src/include/rpc/rpc.h
diff -u src/include/rpc/rpc.h:1.15 src/include/rpc/rpc.h:1.16
--- src/include/rpc/rpc.h:1.15 Thu Jun 22 19:35:34 2006
+++ src/include/rpc/rpc.h Sat Jan 23 01:05:30 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: rpc.h,v 1.15 2006/06/22 19:35:34 christos Exp $ */
+/* $NetBSD: rpc.h,v 1.16 2016/01/23 01:05:30 dholland Exp $ */
/*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -102,7 +102,7 @@ int __rpc_nconf2sockinfo(const struct ne
struct __rpc_sockinfo *);
int __rpc_fd2sockinfo(int, struct __rpc_sockinfo *);
int __rpc_setnodelay(int, const struct __rpc_sockinfo *);
-u_int __rpc_get_t_size(int, int, int);
+unsigned __rpc_get_t_size(int, int, int);
__END_DECLS
#endif /* !_RPC_RPC_H_ */
Index: src/include/rpc/rpcb_prot.x
diff -u src/include/rpc/rpcb_prot.x:1.4 src/include/rpc/rpcb_prot.x:1.5
--- src/include/rpc/rpcb_prot.x:1.4 Sat Dec 3 15:16:19 2005
+++ src/include/rpc/rpcb_prot.x Sat Jan 23 01:05:30 2016
@@ -207,7 +207,7 @@ struct rpcb_rmtcallargs {
% rpcvers_t vers;
% rpcproc_t proc;
% struct {
-% u_int args_len;
+% unsigned args_len;
% const char *args_val;
% } args;
% xdrproc_t xdr_args; /* encodes args */
@@ -230,7 +230,7 @@ struct rpcb_rmtcallres {
%struct r_rpcb_rmtcallres {
% char *addr;
% struct {
-% u_int32_t results_len;
+% uint32_t results_len;
% char *results_val;
% } results;
% xdrproc_t xdr_res; /* decodes results */
@@ -452,7 +452,7 @@ program RPCBPROG {
% rpcprog_t prog; /* program number */
% rpcvers_t vers; /* version number */
% rpcproc_t proc; /* procedure number */
-% u_int32_t arglen; /* arg len */
+% uint32_t arglen; /* arg len */
% caddr_t args_ptr; /* argument */
% xdrproc_t xdr_args; /* XDR routine for argument */
%};
@@ -463,7 +463,7 @@ program RPCBPROG {
% */
%struct rpcb_rmtcallres {
% char *addr_ptr; /* remote universal address */
-% u_int32_t resultslen; /* results length */
+% uint32_t resultslen; /* results length */
% caddr_t results_ptr; /* results */
% xdrproc_t xdr_results; /* XDR routine for result */
%};
Index: src/include/rpc/svc.h
diff -u src/include/rpc/svc.h:1.29 src/include/rpc/svc.h:1.30
--- src/include/rpc/svc.h:1.29 Sat Nov 7 23:10:37 2015
+++ src/include/rpc/svc.h Sat Jan 23 01:05:30 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: svc.h,v 1.29 2015/11/07 23:10:37 christos Exp $ */
+/* $NetBSD: svc.h,v 1.30 2016/01/23 01:05:30 dholland Exp $ */
/*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -86,7 +86,7 @@ enum xprt_stat {
*/
typedef struct __rpc_svcxprt {
int xp_fd;
- u_short xp_port; /* associated port number */
+ unsigned short xp_port; /* associated port number */
const struct xp_ops {
/* receive incomming requests */
bool_t (*xp_recv)(struct __rpc_svcxprt *, struct rpc_msg *);
@@ -108,7 +108,7 @@ 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 u_int,
+ bool_t (*xp_control)(struct __rpc_svcxprt *, const unsigned,
void *);
} *xp_ops2;
char *xp_tp; /* transport provider device name */
@@ -387,32 +387,32 @@ 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 u_int,
- const u_int);
+ const struct t_bind *, const unsigned,
+ const unsigned);
/*
* const int fd; -- connection end point
* const struct netconfig *nconf; -- netconfig structure for network
* const struct t_bind *bindaddr; -- local bind address
- * const u_int sendsz; -- max sendsize
- * const u_int recvsz; -- max recvsize
+ * const unsigned sendsz; -- max sendsize
+ * const unsigned recvsz; -- max recvsize
*/
/*
* Connectionless and connectionful create routines
*/
-extern SVCXPRT *svc_vc_create(const int, const u_int, const u_int);
+extern SVCXPRT *svc_vc_create(const int, const unsigned, const unsigned);
/*
* const int fd; -- open connection end point
- * const u_int sendsize; -- max send size
- * const u_int recvsize; -- max recv size
+ * const unsigned sendsize; -- max send size
+ * const unsigned recvsize; -- max recv size
*/
-extern SVCXPRT *svc_dg_create(const int, const u_int, const u_int);
+extern SVCXPRT *svc_dg_create(const int, const unsigned, const unsigned);
/*
* const int fd; -- open connection
- * const u_int sendsize; -- max send size
- * const u_int recvsize; -- max recv size
+ * const unsigned sendsize; -- max send size
+ * const unsigned recvsize; -- max recv size
*/
@@ -420,11 +420,11 @@ 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 u_int, const u_int);
+extern SVCXPRT *svc_fd_create(const int, const unsigned, const unsigned);
/*
* const int fd; -- open connection end point
- * const u_int sendsize; -- max send size
- * const u_int recvsize; -- max recv size
+ * const unsigned sendsize; -- max send size
+ * const unsigned recvsize; -- max recv size
*/
/*
@@ -435,7 +435,7 @@ extern SVCXPRT *svc_raw_create(void);
/*
* svc_dg_enable_cache() enables the cache on dg transports.
*/
-int svc_dg_enablecache(SVCXPRT *, const u_int);
+int svc_dg_enablecache(SVCXPRT *, const unsigned);
__END_DECLS
Index: src/include/rpc/svc_soc.h
diff -u src/include/rpc/svc_soc.h:1.2 src/include/rpc/svc_soc.h:1.3
--- src/include/rpc/svc_soc.h:1.2 Thu Feb 3 04:39:33 2005
+++ src/include/rpc/svc_soc.h Sat Jan 23 01:05:30 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: svc_soc.h,v 1.2 2005/02/03 04:39:33 perry Exp $ */
+/* $NetBSD: svc_soc.h,v 1.3 2016/01/23 01:05:30 dholland Exp $ */
/*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -58,13 +58,13 @@
*
* svc_register(xprt, prog, vers, dispatch, protocol)
* SVCXPRT *xprt;
- * u_long prog;
- * u_long vers;
+ * unsigned long prog;
+ * unsigned long vers;
* void (*dispatch)();
* int protocol; like TCP or UDP, zero means do not register
*/
__BEGIN_DECLS
-extern bool_t svc_register(SVCXPRT *, u_long, u_long,
+extern bool_t svc_register(SVCXPRT *, unsigned long, unsigned long,
void (*)(struct svc_req *, SVCXPRT *), int);
__END_DECLS
@@ -72,11 +72,11 @@ __END_DECLS
* Service un-registration
*
* svc_unregister(prog, vers)
- * u_long prog;
- * u_long vers;
+ * unsigned long prog;
+ * unsigned long vers;
*/
__BEGIN_DECLS
-extern void svc_unregister(u_long, u_long);
+extern void svc_unregister(unsigned long, unsigned long);
__END_DECLS
@@ -93,8 +93,8 @@ __END_DECLS
*/
__BEGIN_DECLS
extern SVCXPRT *svcudp_create(int);
-extern SVCXPRT *svcudp_bufcreate(int, u_int, u_int);
-extern int svcudp_enablecache(SVCXPRT *, u_long);
+extern SVCXPRT *svcudp_bufcreate(int, unsigned, unsigned);
+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, u_int, u_int);
+extern SVCXPRT *svctcp_create(int, unsigned, unsigned);
__END_DECLS
/*
* Fd based rpc.
*/
__BEGIN_DECLS
-extern SVCXPRT *svcfd_create(int, u_int, u_int);
+extern SVCXPRT *svcfd_create(int, unsigned, unsigned);
__END_DECLS
#endif /* !_RPC_SVC_SOC_H */
Index: src/include/rpc/xdr.h
diff -u src/include/rpc/xdr.h:1.27 src/include/rpc/xdr.h:1.28
--- src/include/rpc/xdr.h:1.27 Tue Aug 30 17:09:51 2011
+++ src/include/rpc/xdr.h Sat Jan 23 01:05:30 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: xdr.h,v 1.27 2011/08/30 17:09:51 plunky Exp $ */
+/* $NetBSD: xdr.h,v 1.28 2016/01/23 01:05:30 dholland Exp $ */
/*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -104,15 +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 *, u_int);
+ bool_t (*x_getbytes)(struct __rpc_xdr *, char *, unsigned);
/* put some bytes to " */
- bool_t (*x_putbytes)(struct __rpc_xdr *, const char *, u_int);
+ bool_t (*x_putbytes)(struct __rpc_xdr *, const char *,
+ unsigned);
/* returns bytes off from beginning */
- u_int (*x_getpostn)(struct __rpc_xdr *);
+ unsigned (*x_getpostn)(struct __rpc_xdr *);
/* lets you reposition the stream */
- bool_t (*x_setpostn)(struct __rpc_xdr *, u_int);
+ bool_t (*x_setpostn)(struct __rpc_xdr *, unsigned);
/* buf quick ptr to buffered data */
- int32_t *(*x_inline)(struct __rpc_xdr *, u_int);
+ int32_t *(*x_inline)(struct __rpc_xdr *, unsigned);
/* free privates of this xdr_stream */
void (*x_destroy)(struct __rpc_xdr *);
bool_t (*x_control)(struct __rpc_xdr *, int, void *);
@@ -120,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 */
- u_int x_handy; /* extra private word */
+ unsigned x_handy; /* extra private word */
} XDR;
/*
@@ -139,8 +140,8 @@ typedef bool_t (*xdrproc_t)(XDR *, const
* XDR *xdrs;
* long *longp;
* char * addr;
- * u_int len;
- * u_int pos;
+ * unsigned len;
+ * unsigned pos;
*/
#define XDR_GETLONG(xdrs, longp) \
(*(xdrs)->x_ops->x_getlong)(xdrs, longp)
@@ -263,9 +264,9 @@ struct xdr_discrim {
#define IXDR_GET_BOOL(buf) ((bool_t)IXDR_GET_LONG(buf))
#define IXDR_GET_ENUM(buf, t) ((t)IXDR_GET_LONG(buf))
-#define IXDR_GET_U_LONG(buf) ((u_long)IXDR_GET_LONG(buf))
+#define IXDR_GET_U_LONG(buf) ((unsigned long)IXDR_GET_LONG(buf))
#define IXDR_GET_SHORT(buf) ((short)IXDR_GET_LONG(buf))
-#define IXDR_GET_U_SHORT(buf) ((u_short)IXDR_GET_LONG(buf))
+#define IXDR_GET_U_SHORT(buf) ((unsigned short)IXDR_GET_LONG(buf))
#define IXDR_PUT_BOOL(buf, v) IXDR_PUT_LONG((buf), (v))
#define IXDR_PUT_ENUM(buf, v) IXDR_PUT_LONG((buf), (v))
@@ -279,11 +280,11 @@ 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 *, u_int *);
+extern bool_t xdr_u_int(XDR *, unsigned *);
extern bool_t xdr_long(XDR *, long *);
-extern bool_t xdr_u_long(XDR *, u_long *);
+extern bool_t xdr_u_long(XDR *, unsigned long *);
extern bool_t xdr_short(XDR *, short *);
-extern bool_t xdr_u_short(XDR *, u_short *);
+extern bool_t xdr_u_short(XDR *, unsigned short *);
extern bool_t xdr_int16_t(XDR *, int16_t *);
extern bool_t xdr_u_int16_t(XDR *, uint16_t *);
extern bool_t xdr_int32_t(XDR *, int32_t *);
@@ -292,19 +293,19 @@ 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 **, u_int *, u_int, u_int, xdrproc_t);
-extern bool_t xdr_bytes(XDR *, char **, u_int *, u_int);
-extern bool_t xdr_opaque(XDR *, char *, u_int);
-extern bool_t xdr_string(XDR *, char **, u_int);
+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_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 *, u_char *);
-extern bool_t xdr_vector(XDR *, char *, u_int, u_int, xdrproc_t);
+extern bool_t xdr_u_char(XDR *, unsigned char *);
+extern bool_t xdr_vector(XDR *, char *, unsigned, unsigned, 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 **, u_int, xdrproc_t);
-extern bool_t xdr_pointer(XDR *, char **, u_int, xdrproc_t);
+extern bool_t xdr_reference(XDR *, char **, unsigned, xdrproc_t);
+extern bool_t xdr_pointer(XDR *, char **, unsigned, xdrproc_t);
extern bool_t xdr_wrapstring(XDR *, char **);
extern void xdr_free(xdrproc_t, char *);
extern bool_t xdr_hyper(XDR *, longlong_t *);
@@ -320,7 +321,7 @@ __END_DECLS
*/
#define MAX_NETOBJ_SZ 1024
struct netobj {
- u_int n_len;
+ unsigned n_len;
char *n_bytes;
};
typedef struct netobj netobj;
@@ -332,7 +333,7 @@ extern bool_t xdr_netobj(XDR *, struct
*/
__BEGIN_DECLS
/* XDR using memory buffers */
-extern void xdrmem_create(XDR *, char *, u_int, enum xdr_op);
+extern void xdrmem_create(XDR *, char *, unsigned, enum xdr_op);
/* XDR using stdio library */
#ifdef _STDIO_H_
@@ -340,7 +341,7 @@ extern void xdrstdio_create(XDR *, FIL
#endif
/* XDR pseudo records for tcp */
-extern void xdrrec_create(XDR *, u_int, u_int, char *,
+extern void xdrrec_create(XDR *, unsigned, unsigned, char *,
int (*)(char *, char *, int),
int (*)(char *, char *, int));
@@ -352,7 +353,7 @@ extern bool_t xdrrec_skiprecord(XDR *);
/* true if no more input */
extern bool_t xdrrec_eof(XDR *);
-extern u_int xdrrec_readbytes(XDR *, caddr_t, u_int);
+extern unsigned xdrrec_readbytes(XDR *, caddr_t, unsigned);
__END_DECLS
#endif /* !_RPC_XDR_H_ */
