From 0fcbeb515df8d1e45ccfbdace5b45653846c747f Mon Sep 17 00:00:00 2001 From: Marc Espie Date: Thu, 22 Jan 2004 21:48:03 +0000 Subject: Remove unnecessary typedef usage. u_char -> unsigned char u_short -> unsigned short u_long -> unsigned long u_int -> unsigned int okay millert@ --- include/rpc/auth.h | 11 ++++---- include/rpc/auth_unix.h | 14 +++++----- include/rpc/clnt.h | 72 ++++++++++++++++++++++++------------------------- include/rpc/pmap_clnt.h | 22 ++++++++------- include/rpc/pmap_prot.h | 24 ++++++++--------- include/rpc/pmap_rmt.h | 8 +++--- include/rpc/rpc_msg.h | 6 ++--- include/rpc/svc.h | 24 ++++++++--------- include/rpc/xdr.h | 65 +++++++++++++++++++++++--------------------- 9 files changed, 127 insertions(+), 119 deletions(-) (limited to 'include/rpc') diff --git a/include/rpc/auth.h b/include/rpc/auth.h index fc983083b47..77d6b77503f 100644 --- a/include/rpc/auth.h +++ b/include/rpc/auth.h @@ -1,4 +1,4 @@ -/* $OpenBSD: auth.h,v 1.4 2002/02/17 19:42:21 millert Exp $ */ +/* $OpenBSD: auth.h,v 1.5 2004/01/22 21:48:02 espie Exp $ */ /* $NetBSD: auth.h,v 1.7 1995/04/29 05:27:55 cgd Exp $ */ /* @@ -88,9 +88,9 @@ __END_DECLS * Authentication info. Opaque to client. */ 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 */ + enum_t oa_flavor; /* flavor of auth */ + caddr_t oa_base; /* address of more auth stuff */ + unsigned int oa_length; /* not to exceed MAX_AUTH_BYTES */ }; @@ -172,7 +172,8 @@ 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, struct sockaddr_in *, des_block *); +extern AUTH *authdes_create(char *, unsigned int, struct sockaddr_in *, + des_block *); __END_DECLS #define AUTH_NONE 0 /* no authentication */ diff --git a/include/rpc/auth_unix.h b/include/rpc/auth_unix.h index e65f224fe62..a0eec0de2fd 100644 --- a/include/rpc/auth_unix.h +++ b/include/rpc/auth_unix.h @@ -1,4 +1,4 @@ -/* $OpenBSD: auth_unix.h,v 1.3 2002/02/16 21:27:18 millert Exp $ */ +/* $OpenBSD: auth_unix.h,v 1.4 2004/01/22 21:48:02 espie Exp $ */ /* $NetBSD: auth_unix.h,v 1.4 1994/10/26 00:56:56 cgd Exp $ */ /* @@ -60,12 +60,12 @@ * Unix style credentials. */ struct authunix_parms { - u_long aup_time; - char *aup_machname; - int aup_uid; - int aup_gid; - u_int aup_len; - int *aup_gids; + unsigned long aup_time; + char *aup_machname; + int aup_uid; + int aup_gid; + unsigned int aup_len; + int *aup_gids; }; __BEGIN_DECLS diff --git a/include/rpc/clnt.h b/include/rpc/clnt.h index 353cb6334d4..29add82934b 100644 --- a/include/rpc/clnt.h +++ b/include/rpc/clnt.h @@ -1,4 +1,4 @@ -/* $OpenBSD: clnt.h,v 1.9 2003/03/16 00:34:01 margarida Exp $ */ +/* $OpenBSD: clnt.h,v 1.10 2004/01/22 21:48:02 espie Exp $ */ /* $NetBSD: clnt.h,v 1.6 1995/04/29 05:27:58 cgd Exp $ */ /* @@ -121,8 +121,8 @@ typedef struct __rpc_client { struct clnt_ops { /* call remote procedure */ enum clnt_stat (*cl_call)(struct __rpc_client *, - u_long, xdrproc_t, caddr_t, xdrproc_t, - caddr_t, struct timeval); + unsigned long, xdrproc_t, caddr_t, + xdrproc_t, caddr_t, struct timeval); /* abort a call */ void (*cl_abort)(struct __rpc_client *); /* get specific error code */ @@ -134,8 +134,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 *, u_int, - void *); + bool_t (*cl_control)(struct __rpc_client *, + unsigned int, void *); } *cl_ops; caddr_t cl_private; /* private stuff */ } CLIENT; @@ -152,7 +152,7 @@ typedef struct __rpc_client { * enum clnt_stat * CLNT_CALL(rh, proc, xargs, argsp, xres, resp, timeout) * CLIENT *rh; - * u_long proc; + * unsigned long proc; * xdrproc_t xargs; * caddr_t argsp; * xdrproc_t xres; @@ -197,7 +197,7 @@ typedef struct __rpc_client { * bool_t * CLNT_CONTROL(cl, request, info) * CLIENT *cl; - * u_int request; + * unsigned int request; * char *info; */ #define CLNT_CONTROL(cl,rq,in) ((*(cl)->cl_ops->cl_control)(cl,rq,in)) @@ -230,16 +230,16 @@ typedef struct __rpc_client { * and network administration. */ -#define RPCTEST_PROGRAM ((u_long)1) -#define RPCTEST_VERSION ((u_long)1) -#define RPCTEST_NULL_PROC ((u_long)2) -#define RPCTEST_NULL_BATCH_PROC ((u_long)3) +#define RPCTEST_PROGRAM ((unsigned long)1) +#define RPCTEST_VERSION ((unsigned long)1) +#define RPCTEST_NULL_PROC ((unsigned long)2) +#define RPCTEST_NULL_BATCH_PROC ((unsigned long)3) /* * By convention, procedure 0 takes null arguments and returns them */ -#define NULLPROC ((u_int)0) +#define NULLPROC ((unsigned int)0) /* * Below are the client handle creation routines for the various @@ -251,11 +251,11 @@ typedef struct __rpc_client { * Memory based rpc (for speed check and testing) * CLIENT * * clntraw_create(prog, vers) - * u_long prog; - * u_long vers; + * unsigned long prog; + * unsigned long vers; */ __BEGIN_DECLS -extern CLIENT *clntraw_create(u_long, u_long); +extern CLIENT *clntraw_create(unsigned long, unsigned long); __END_DECLS @@ -263,13 +263,13 @@ __END_DECLS * Generic client creation routine. Supported protocols are "udp" and "tcp" * CLIENT * * clnt_create(host, prog, vers, prot); - * char *host; -- hostname - * u_long prog; -- program number - * u_long vers; -- version number - * char *prot; -- protocol + * char *host; -- hostname + * unsigned long prog; -- program number + * unsigned long vers; -- version number + * char *prot; -- protocol */ __BEGIN_DECLS -extern CLIENT *clnt_create(char *, u_long, u_long, char *); +extern CLIENT *clnt_create(char *, unsigned long, unsigned long, char *); __END_DECLS @@ -278,15 +278,15 @@ __END_DECLS * 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 int sendsz; + * unsigned int recvsz; */ __BEGIN_DECLS -extern CLIENT *clnttcp_create(struct sockaddr_in *, u_long, u_long, int *, - u_int, u_int); +extern CLIENT *clnttcp_create(struct sockaddr_in *, unsigned long, + unsigned long, int *, unsigned int, unsigned int); __END_DECLS @@ -295,8 +295,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; * @@ -304,18 +304,18 @@ __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 int sendsz; + * unsigned int recvsz; */ __BEGIN_DECLS -extern CLIENT *clntudp_create(struct sockaddr_in *, u_long, u_long, - struct timeval, int *); -extern CLIENT *clntudp_bufcreate(struct sockaddr_in *, u_long, u_long, - struct timeval, int *, u_int, u_int); +extern CLIENT *clntudp_create(struct sockaddr_in *, unsigned long, + unsigned long, struct timeval, int *); +extern CLIENT *clntudp_bufcreate(struct sockaddr_in *, unsigned long, + unsigned long, struct timeval, int *, unsigned int, unsigned int); __END_DECLS diff --git a/include/rpc/pmap_clnt.h b/include/rpc/pmap_clnt.h index 2a6fbecb355..4c3937b5c5d 100644 --- a/include/rpc/pmap_clnt.h +++ b/include/rpc/pmap_clnt.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap_clnt.h,v 1.5 2002/02/17 19:42:21 millert Exp $ */ +/* $OpenBSD: pmap_clnt.h,v 1.6 2004/01/22 21:48:02 espie Exp $ */ /* $NetBSD: pmap_clnt.h,v 1.5 1994/12/04 01:12:42 cgd Exp $ */ /* @@ -67,17 +67,19 @@ #include __BEGIN_DECLS -extern bool_t pmap_set(u_long, u_long, u_int, int); -extern bool_t pmap_unset(u_long, u_long); +extern bool_t pmap_set(unsigned long, unsigned long, unsigned int, + int); +extern bool_t pmap_unset(unsigned long, unsigned long); extern struct pmaplist *pmap_getmaps(struct sockaddr_in *); -extern enum clnt_stat pmap_rmtcall(struct sockaddr_in *, u_long, u_long, - u_long, xdrproc_t, caddr_t, xdrproc_t, caddr_t, - struct timeval, u_long *); -extern enum clnt_stat clnt_broadcast(u_long, u_long, u_long, xdrproc_t, - char *, xdrproc_t, char *, +extern enum clnt_stat pmap_rmtcall(struct sockaddr_in *, unsigned long, + unsigned long, unsigned long, xdrproc_t, caddr_t, + xdrproc_t, caddr_t, struct timeval, + unsigned long *); +extern enum clnt_stat clnt_broadcast(unsigned long, unsigned long, + unsigned long, xdrproc_t, char *, xdrproc_t, char *, bool_t (*)(caddr_t, struct sockaddr_in *)); -extern u_short pmap_getport(struct sockaddr_in *, u_long, u_long, - u_int); +extern unsigned short pmap_getport(struct sockaddr_in *, unsigned long, + unsigned long, unsigned int); __END_DECLS #endif /* !_RPC_PMAPCLNT_H */ diff --git a/include/rpc/pmap_prot.h b/include/rpc/pmap_prot.h index 32e88323b2f..f90d110a416 100644 --- a/include/rpc/pmap_prot.h +++ b/include/rpc/pmap_prot.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap_prot.h,v 1.4 2002/02/16 21:27:18 millert Exp $ */ +/* $OpenBSD: pmap_prot.h,v 1.5 2004/01/22 21:48:02 espie Exp $ */ /* $NetBSD: pmap_prot.h,v 1.4 1994/10/26 00:57:00 cgd Exp $ */ /* @@ -74,17 +74,17 @@ #define _RPC_PMAPPROT_H #include -#define PMAPPORT ((u_short)111) -#define PMAPPROG ((u_long)100000) -#define PMAPVERS ((u_long)2) -#define PMAPVERS_PROTO ((u_long)2) -#define PMAPVERS_ORIG ((u_long)1) -#define PMAPPROC_NULL ((u_long)0) -#define PMAPPROC_SET ((u_long)1) -#define PMAPPROC_UNSET ((u_long)2) -#define PMAPPROC_GETPORT ((u_long)3) -#define PMAPPROC_DUMP ((u_long)4) -#define PMAPPROC_CALLIT ((u_long)5) +#define PMAPPORT ((unsigned short)111) +#define PMAPPROG ((unsigned long)100000) +#define PMAPVERS ((unsigned long)2) +#define PMAPVERS_PROTO ((unsigned long)2) +#define PMAPVERS_ORIG ((unsigned long)1) +#define PMAPPROC_NULL ((unsigned long)0) +#define PMAPPROC_SET ((unsigned long)1) +#define PMAPPROC_UNSET ((unsigned long)2) +#define PMAPPROC_GETPORT ((unsigned long)3) +#define PMAPPROC_DUMP ((unsigned long)4) +#define PMAPPROC_CALLIT ((unsigned long)5) struct pmap { unsigned long pm_prog; diff --git a/include/rpc/pmap_rmt.h b/include/rpc/pmap_rmt.h index ca3a4d66457..c2a6b2daadc 100644 --- a/include/rpc/pmap_rmt.h +++ b/include/rpc/pmap_rmt.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap_rmt.h,v 1.3 2002/02/16 21:27:18 millert Exp $ */ +/* $OpenBSD: pmap_rmt.h,v 1.4 2004/01/22 21:48:02 espie Exp $ */ /* $NetBSD: pmap_rmt.h,v 1.4 1994/10/26 00:57:01 cgd Exp $ */ /* @@ -45,14 +45,14 @@ #include struct rmtcallargs { - u_long prog, vers, proc, arglen; + unsigned long prog, vers, proc, arglen; caddr_t args_ptr; xdrproc_t xdr_args; }; struct rmtcallres { - u_long *port_ptr; - u_long resultslen; + unsigned long *port_ptr; + unsigned long resultslen; caddr_t results_ptr; xdrproc_t xdr_results; }; diff --git a/include/rpc/rpc_msg.h b/include/rpc/rpc_msg.h index 1305959c8f7..821ae6223f3 100644 --- a/include/rpc/rpc_msg.h +++ b/include/rpc/rpc_msg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: rpc_msg.h,v 1.3 2002/02/16 21:27:18 millert Exp $ */ +/* $OpenBSD: rpc_msg.h,v 1.4 2004/01/22 21:48:02 espie Exp $ */ /* $NetBSD: rpc_msg.h,v 1.5 1995/04/29 05:28:00 cgd Exp $ */ /* @@ -43,8 +43,8 @@ #ifndef _RPC_RPCMSG_H #define _RPC_RPCMSG_H -#define RPC_MSG_VERSION ((u_long) 2) -#define RPC_SERVICE_PORT ((u_short) 2048) +#define RPC_MSG_VERSION ((unsigned long) 2) +#define RPC_SERVICE_PORT ((unsigned short) 2048) /* * Bottom up definition of an rpc message. diff --git a/include/rpc/svc.h b/include/rpc/svc.h index 717a27c73cb..e99472105bd 100644 --- a/include/rpc/svc.h +++ b/include/rpc/svc.h @@ -1,4 +1,4 @@ -/* $OpenBSD: svc.h,v 1.8 2003/12/31 03:27:23 millert Exp $ */ +/* $OpenBSD: svc.h,v 1.9 2004/01/22 21:48:02 espie Exp $ */ /* $NetBSD: svc.h,v 1.9 1995/04/29 05:28:01 cgd Exp $ */ /* @@ -77,7 +77,7 @@ enum xprt_stat { */ typedef struct __rpc_svcxprt { int xp_sock; - u_short xp_port; /* associated port number */ + unsigned short xp_port; /* associated port number */ struct xp_ops { /* receive incomming requests */ bool_t (*xp_recv)(struct __rpc_svcxprt *, @@ -164,13 +164,13 @@ struct svc_req { * * 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 @@ -178,11 +178,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 /* @@ -240,7 +240,7 @@ extern bool_t svc_sendreply(SVCXPRT *, xdrproc_t, char *); extern void svcerr_decode(SVCXPRT *); extern void svcerr_weakauth(SVCXPRT *); extern void svcerr_noproc(SVCXPRT *); -extern void svcerr_progvers(SVCXPRT *, u_long, u_long); +extern void svcerr_progvers(SVCXPRT *, unsigned long, unsigned long); extern void svcerr_auth(SVCXPRT *, enum auth_stat); extern void svcerr_noprog(SVCXPRT *); extern void svcerr_systemerr(SVCXPRT *); @@ -304,7 +304,7 @@ __END_DECLS */ __BEGIN_DECLS extern SVCXPRT *svcudp_create(int); -extern SVCXPRT *svcudp_bufcreate(int, u_int, u_int); +extern SVCXPRT *svcudp_bufcreate(int, unsigned int, unsigned int); __END_DECLS @@ -312,14 +312,14 @@ __END_DECLS * Tcp based rpc. */ __BEGIN_DECLS -extern SVCXPRT *svctcp_create(int, u_int, u_int); +extern SVCXPRT *svctcp_create(int, unsigned int, unsigned int); __END_DECLS /* * Fd based rpc. */ __BEGIN_DECLS -extern SVCXPRT *svcfd_create(int, u_int, u_int); +extern SVCXPRT *svcfd_create(int, unsigned int, unsigned int); __END_DECLS #endif /* !_RPC_SVC_H */ diff --git a/include/rpc/xdr.h b/include/rpc/xdr.h index e91b90be117..6100b0fffd3 100644 --- a/include/rpc/xdr.h +++ b/include/rpc/xdr.h @@ -1,4 +1,4 @@ -/* $OpenBSD: xdr.h,v 1.6 2003/03/10 03:45:20 david Exp $ */ +/* $OpenBSD: xdr.h,v 1.7 2004/01/22 21:48:02 espie Exp $ */ /* $NetBSD: xdr.h,v 1.7 1995/04/29 05:28:06 cgd Exp $ */ /* @@ -105,22 +105,24 @@ typedef struct __rpc_xdr { /* put a long to " */ bool_t (*x_putlong)(struct __rpc_xdr *, long *); /* get some bytes from " */ - bool_t (*x_getbytes)(struct __rpc_xdr *, caddr_t, u_int); + bool_t (*x_getbytes)(struct __rpc_xdr *, caddr_t, + unsigned int); /* put some bytes to " */ - bool_t (*x_putbytes)(struct __rpc_xdr *, caddr_t, u_int); + bool_t (*x_putbytes)(struct __rpc_xdr *, caddr_t, + unsigned int); /* returns bytes off from beginning */ - u_int (*x_getpostn)(struct __rpc_xdr *); + unsigned int (*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 int); /* buf quick ptr to buffered data */ - int32_t *(*x_inline)(struct __rpc_xdr *, u_int); + int32_t *(*x_inline)(struct __rpc_xdr *, unsigned int); /* free privates of this xdr_stream */ void (*x_destroy)(struct __rpc_xdr *); } *x_ops; caddr_t x_public; /* users' data */ caddr_t x_private; /* pointer to private data */ caddr_t x_base; /* private used for position info */ - u_int x_handy; /* extra private word */ + unsigned int x_handy; /* extra private word */ } XDR; /* @@ -133,7 +135,7 @@ typedef struct __rpc_xdr { * * XXX can't actually prototype it, because some take three args!!! */ -typedef bool_t (*xdrproc_t)(/* XDR *, void *, u_int */); +typedef bool_t (*xdrproc_t)(/* XDR *, void *, unsigned int */); /* * Operations defined on a XDR handle @@ -141,8 +143,8 @@ typedef bool_t (*xdrproc_t)(/* XDR *, void *, u_int */); * XDR *xdrs; * long *longp; * caddr_t addr; - * u_int len; - * u_int pos; + * unsigned int len; + * unsigned int pos; */ #define XDR_GETLONG(xdrs, longp) \ (*(xdrs)->x_ops->x_getlong)(xdrs, longp) @@ -217,14 +219,14 @@ struct xdr_discrim { * N.B. and frozen for all time: each data type here uses 4 bytes * of external representation. */ -#define IXDR_GET_LONG(buf) ((long)ntohl((u_long)*(buf)++)) -#define IXDR_PUT_LONG(buf, v) (*(buf)++ = (long)htonl((u_long)v)) +#define IXDR_GET_LONG(buf) ((long)ntohl((unsigned long)*(buf)++)) +#define IXDR_PUT_LONG(buf, v) (*(buf)++ = (long)htonl((unsigned long)v)) #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), ((long)(v))) #define IXDR_PUT_ENUM(buf, v) IXDR_PUT_LONG((buf), ((long)(v))) @@ -238,29 +240,32 @@ 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 int *); 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 *, u_int16_t *); extern bool_t xdr_int32_t(XDR *, int32_t *); extern bool_t xdr_u_int32_t(XDR *, u_int32_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 *, caddr_t, u_int); -extern bool_t xdr_string(XDR *, char **, u_int); -extern bool_t xdr_union(XDR *, enum_t *, char *, struct xdr_discrim *, xdrproc_t); +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 *, caddr_t, unsigned int); +extern bool_t xdr_string(XDR *, char **, unsigned int); +extern bool_t xdr_union(XDR *, enum_t *, char *, 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 int, unsigned int, + xdrproc_t); extern bool_t xdr_float(XDR *, float *); extern bool_t xdr_double(XDR *, double *); -extern bool_t xdr_reference(XDR *, caddr_t *, u_int, xdrproc_t); -extern bool_t xdr_pointer(XDR *, caddr_t *, u_int, xdrproc_t); +extern bool_t xdr_reference(XDR *, caddr_t *, unsigned int, xdrproc_t); +extern bool_t xdr_pointer(XDR *, caddr_t *, unsigned int, xdrproc_t); extern bool_t xdr_wrapstring(XDR *, char **); extern void xdr_free(xdrproc_t, char *); __END_DECLS @@ -271,8 +276,8 @@ __END_DECLS */ #define MAX_NETOBJ_SZ 1024 struct netobj { - u_int n_len; - char *n_bytes; + unsigned int n_len; + char *n_bytes; }; typedef struct netobj netobj; extern bool_t xdr_netobj(XDR *, struct netobj *); @@ -283,7 +288,7 @@ extern bool_t xdr_netobj(XDR *, struct netobj *); */ __BEGIN_DECLS /* XDR using memory buffers */ -extern void xdrmem_create(XDR *, char *, u_int, enum xdr_op); +extern void xdrmem_create(XDR *, char *, unsigned int, enum xdr_op); #ifdef _STDIO_H_ /* XDR using stdio library */ @@ -291,7 +296,7 @@ extern void xdrstdio_create(XDR *, FILE *, enum xdr_op); #endif /* XDR pseudo records for tcp */ -extern void xdrrec_create(XDR *, u_int, u_int, char *, +extern void xdrrec_create(XDR *, unsigned int, unsigned int, char *, int (*)(caddr_t, caddr_t, int), int (*)(caddr_t, caddr_t, int)); -- cgit v1.2.3