svn commit: r240542 - in stable/9: include/rpc sys/rpc

[Pedro F. Giffuni]

Author: pfg
Date: Sun Sep 16 00:32:25 2012
New Revision: 240542
URL: http://svn.freebsd.org/changeset/base/240542

Log:
  MFC	r240060, r240062:
  
  Rename __rpc_xdr with XDR. This fixes at least one C++ application and
  matches what upstream (Solaris) has done on their xdr.h header.
  
  PR:	137443

Modified:
  stable/9/include/rpc/xdr.h
  stable/9/sys/rpc/rpc_com.h
  stable/9/sys/rpc/xdr.h

Modified: stable/9/include/rpc/xdr.h
==============================================================================
--- stable/9/include/rpc/xdr.h	Sat Sep 15 21:56:30 2012	(r240541)
+++ stable/9/include/rpc/xdr.h	Sun Sep 16 00:32:25 2012	(r240542)
@@ -97,26 +97,26 @@ enum xdr_op {
  * an operations vector for the particular implementation (e.g. see xdr_mem.c),
  * and two private fields for the use of the particular implementation.
  */
-typedef struct __rpc_xdr {
+typedef struct XDR {
 	enum xdr_op	x_op;		/* operation; fast additional param */
 	const struct xdr_ops {
 		/* get a long from underlying stream */
-		bool_t	(*x_getlong)(struct __rpc_xdr *, long *);
+		bool_t	(*x_getlong)(struct XDR *, long *);
 		/* put a long to " */
-		bool_t	(*x_putlong)(struct __rpc_xdr *, const long *);
+		bool_t	(*x_putlong)(struct XDR *, const long *);
 		/* get some bytes from " */
-		bool_t	(*x_getbytes)(struct __rpc_xdr *, char *, u_int);
+		bool_t	(*x_getbytes)(struct XDR *, char *, u_int);
 		/* put some bytes to " */
-		bool_t	(*x_putbytes)(struct __rpc_xdr *, const char *, u_int);
+		bool_t	(*x_putbytes)(struct XDR *, const char *, u_int);
 		/* returns bytes off from beginning */
-		u_int	(*x_getpostn)(struct __rpc_xdr *);
+		u_int	(*x_getpostn)(struct XDR *);
 		/* lets you reposition the stream */
-		bool_t  (*x_setpostn)(struct __rpc_xdr *, u_int);
+		bool_t  (*x_setpostn)(struct XDR *, u_int);
 		/* buf quick ptr to buffered data */
-		int32_t *(*x_inline)(struct __rpc_xdr *, u_int);
+		int32_t *(*x_inline)(struct XDR *, u_int);
 		/* free privates of this xdr_stream */
-		void	(*x_destroy)(struct __rpc_xdr *);
-		bool_t	(*x_control)(struct __rpc_xdr *, int, void *);
+		void	(*x_destroy)(struct XDR *);
+		bool_t	(*x_control)(struct XDR *, int, void *);
 	} *x_ops;
 	char *	 	x_public;	/* users' data */
 	void *		x_private;	/* pointer to private data */

Modified: stable/9/sys/rpc/rpc_com.h
==============================================================================
--- stable/9/sys/rpc/rpc_com.h	Sat Sep 15 21:56:30 2012	(r240541)
+++ stable/9/sys/rpc/rpc_com.h	Sun Sep 16 00:32:25 2012	(r240542)
@@ -114,8 +114,8 @@ extern int __rpc_sockisbound(struct sock
 extern int bindresvport(struct socket *so, struct sockaddr *sa);
 
 struct xucred;
-struct __rpc_xdr;
-bool_t xdr_authunix_parms(struct __rpc_xdr *xdrs, uint32_t *time, struct xucred *cred);
+struct XDR;
+bool_t xdr_authunix_parms(struct XDR *xdrs, uint32_t *time, struct xucred *cred);
 #endif
 
 __END_DECLS

Modified: stable/9/sys/rpc/xdr.h
==============================================================================
--- stable/9/sys/rpc/xdr.h	Sat Sep 15 21:56:30 2012	(r240541)
+++ stable/9/sys/rpc/xdr.h	Sun Sep 16 00:32:25 2012	(r240542)
@@ -97,26 +97,26 @@ enum xdr_op {
  * an operations vector for the particular implementation (e.g. see xdr_mem.c),
  * and two private fields for the use of the particular implementation.
  */
-typedef struct __rpc_xdr {
+typedef struct XDR {
 	enum xdr_op	x_op;		/* operation; fast additional param */
 	const struct xdr_ops {
 		/* get a long from underlying stream */
-		bool_t	(*x_getlong)(struct __rpc_xdr *, long *);
+		bool_t	(*x_getlong)(struct XDR *, long *);
 		/* put a long to " */
-		bool_t	(*x_putlong)(struct __rpc_xdr *, const long *);
+		bool_t	(*x_putlong)(struct XDR *, const long *);
 		/* get some bytes from " */
-		bool_t	(*x_getbytes)(struct __rpc_xdr *, char *, u_int);
+		bool_t	(*x_getbytes)(struct XDR *, char *, u_int);
 		/* put some bytes to " */
-		bool_t	(*x_putbytes)(struct __rpc_xdr *, const char *, u_int);
+		bool_t	(*x_putbytes)(struct XDR *, const char *, u_int);
 		/* returns bytes off from beginning */
-		u_int	(*x_getpostn)(struct __rpc_xdr *);
+		u_int	(*x_getpostn)(struct XDR *);
 		/* lets you reposition the stream */
-		bool_t  (*x_setpostn)(struct __rpc_xdr *, u_int);
+		bool_t  (*x_setpostn)(struct XDR *, u_int);
 		/* buf quick ptr to buffered data */
-		int32_t *(*x_inline)(struct __rpc_xdr *, u_int);
+		int32_t *(*x_inline)(struct XDR *, u_int);
 		/* free privates of this xdr_stream */
-		void	(*x_destroy)(struct __rpc_xdr *);
-		bool_t	(*x_control)(struct __rpc_xdr *, int, void *);
+		void	(*x_destroy)(struct XDR *);
+		bool_t	(*x_control)(struct XDR *, int, void *);
 	} *x_ops;
 	char *	 	x_public;	/* users' data */
 	void *		x_private;	/* pointer to private data */