2005-01-07 Ralf Corsepius <ralf.corsepius@rtems.org>

	* librpc/include/rpc/auth_des.h, librpc/include/rpc/xdr.h,
	librpc/src/rpc/auth_des.c, librpc/src/rpc/auth_unix.c,
	librpc/src/rpc/rpc_prot.c, librpc/src/xdr/xdr.c:
	Misc. ansi-fications, misc. updates from FreeBSD.

2 files changed, 54 insertions, 52 deletions

diff --git a/cpukit/librpc/include/rpc/auth_des.h b/cpukit/librpc/include/rpc/auth_des.h
index a7635f87e1..634f0ec636 100644
--- a/cpukit/librpc/include/rpc/auth_des.h
+++ b/cpukit/librpc/include/rpc/auth_des.h
@@ -103,7 +103,7 @@ struct authdes_verf {
 #define adv_nickname	adv_int_u
 
 __BEGIN_DECLS
-extern int authdes_getucred __P(( struct authdes_cred *, uid_t *, gid_t *, int *, gid_t * ));
+extern int authdes_getucred ( struct authdes_cred *, uid_t *, gid_t *, int *, gid_t * );
 __END_DECLS
 
 #endif /* ndef _AUTH_DES_ */
diff --git a/cpukit/librpc/include/rpc/xdr.h b/cpukit/librpc/include/rpc/xdr.h
index 78385bdee2..13867875a7 100644
--- a/cpukit/librpc/include/rpc/xdr.h
+++ b/cpukit/librpc/include/rpc/xdr.h
@@ -1,3 +1,5 @@
+/*	$NetBSD: xdr.h,v 1.19 2000/07/17 05:00:45 matt Exp $	*/
+
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
  * unrestricted use provided that this legend is included on all tape
@@ -28,7 +30,7 @@
  *
  *	from: @(#)xdr.h 1.19 87/04/22 SMI
  *	from: @(#)xdr.h	2.2 88/07/29 4.0 RPCSRC
- * $FreeBSD: src/include/rpc/xdr.h,v 1.14 1999/12/29 05:00:44 peter Exp $
+ * $FreeBSD: src/include/rpc/xdr.h,v 1.23 2003/03/07 13:19:40 nectar Exp $
  */
 
 /*
@@ -99,26 +101,26 @@ typedef struct __rpc_xdr {
 	enum xdr_op	x_op;		/* operation; fast additional param */
 	struct xdr_ops {
 		/* get a long from underlying stream */
-		bool_t	(*x_getlong) (struct __rpc_xdr *, long *);
+		bool_t	(*x_getlong)(struct __rpc_xdr *, long *);
 		/* put a long to underlying stream */
-		bool_t	(*x_putlong) (struct __rpc_xdr *, long *);
+		bool_t	(*x_putlong)(struct __rpc_xdr *, const long *);
 		/* get some bytes from underlying stream */
-		bool_t	(*x_getbytes) (struct __rpc_xdr *, caddr_t, u_int);
+		bool_t	(*x_getbytes)(struct __rpc_xdr *, char *, u_int);
 		/* put some bytes to underlying stream */
-		bool_t	(*x_putbytes) (struct __rpc_xdr *, caddr_t, u_int);
+		bool_t	(*x_putbytes)(struct __rpc_xdr *, const char *, u_int);
 		/* returns bytes off from beginning */
-		u_int	(*x_getpostn) (struct __rpc_xdr *);
+		u_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 *, u_int);
 		/* buf quick ptr to buffered data */
-		int32_t *(*x_inline) (struct __rpc_xdr *, u_int);
+		int32_t *(*x_inline)(struct __rpc_xdr *, u_int);
 		/* free privates of this xdr_stream */
-		void	(*x_destroy) (struct __rpc_xdr *);
+		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 */
-	int		x_handy;	/* extra private word */
+	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 */
 } XDR;
 
 /*
@@ -185,7 +187,7 @@ typedef	bool_t (*xdrproc_t) (XDR *, void *, ...);
 /*
  * Support struct for discriminated unions.
  * You create an array of xdrdiscrim structures, terminated with
- * a entry with a null procedure pointer.  The xdr_union routine gets
+ * an entry with a null procedure pointer.  The xdr_union routine gets
  * the discriminant value and then searches the array of structures
  * for a matching value.  If a match is found the associated xdr routine
  * is called to handle that part of the union.  If there is
@@ -232,36 +234,36 @@ struct xdr_discrim {
  * These are the "generic" xdr routines.
  */
 __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_long	(XDR *, long *);
-extern bool_t	xdr_u_long	(XDR *, u_long *);
-extern bool_t	xdr_short	(XDR *, short *);
-extern bool_t	xdr_u_short	(XDR *, u_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_int64_t	(XDR *, int64_t *);
-extern bool_t	xdr_u_int64_t	(XDR *, u_int64_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_void(void);
+extern bool_t	xdr_int(XDR *, int *);
+extern bool_t	xdr_u_int(XDR *, u_int *);
+extern bool_t	xdr_long(XDR *, long *);
+extern bool_t	xdr_u_long(XDR *, u_long *);
+extern bool_t	xdr_short(XDR *, short *);
+extern bool_t	xdr_u_short(XDR *, u_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_int64_t(XDR *, int64_t *);
+extern bool_t	xdr_u_int64_t(XDR *, u_int64_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 *, const struct xdr_discrim *, xdrproc_t);
 extern unsigned long	xdr_sizeof (xdrproc_t, void *);
-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_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_wrapstring	(XDR *, char **);
-extern void	xdr_free 	(xdrproc_t, char *);
+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_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_wrapstring(XDR *, char **);
+extern void	xdr_free(xdrproc_t, char *);
 __END_DECLS
 
 /*
@@ -274,7 +276,7 @@ struct netobj {
 	char	*n_bytes;
 };
 typedef struct netobj netobj;
-extern bool_t   xdr_netobj (XDR *, struct netobj *);
+extern bool_t   xdr_netobj(XDR *, struct netobj *);
 
 /*
  * These are the public routines for the various implementations of
@@ -282,26 +284,26 @@ 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 *, u_int, enum xdr_op);
 
-#ifdef _STDIO_H_
 /* XDR using stdio library */
-extern void   xdrstdio_create	(XDR *, FILE *, enum xdr_op);
+#ifdef _STDIO_H_
+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 *, u_int, u_int, char *,
 				int (*) (caddr_t, caddr_t, int),
 				int (*) (caddr_t, caddr_t, int));
 
 /* make end of xdr record */
-extern bool_t xdrrec_endofrecord (XDR *, bool_t);
+extern bool_t xdrrec_endofrecord(XDR *, bool_t);
 
 /* move to beginning of next record */
-extern bool_t xdrrec_skiprecord	(XDR *);
+extern bool_t xdrrec_skiprecord(XDR *);
 
 /* true if no more input */
-extern bool_t xdrrec_eof	(XDR *);
+extern bool_t xdrrec_eof(XDR *);
 __END_DECLS
 
 #endif /* !_RPC_XDR_H */