From: Chuck Lever <chuck.lever@oracle.com>
Date: Tue, 18 May 2010 23:45:56 +0000 (-0400)
Subject: Clean up:  Prevent unnecessary compiler warnings like:
X-Git-Tag: libtirpc-0-2-2-rc2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4cdcdcf293f0891cf227d8f20e892124ec17d6d5;p=libtirpc

Clean up:  Prevent unnecessary compiler warnings like:

/usr/include/tirpc/rpc/rpcent.h:48:1: warning: C++ style comments are
not allowed in ISO C90

These appear when users compile their programs against TI-RPC headers
with "-pedantic" and the default standards setting (-std=gnu89).

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
---

diff --git a/tirpc/rpc/auth_des.h b/tirpc/rpc/auth_des.h
index f3f9f31..39b5332 100644
--- a/tirpc/rpc/auth_des.h
+++ b/tirpc/rpc/auth_des.h
@@ -84,7 +84,7 @@ struct authdes_verf {
 		struct timeval adv_ctime;	/* clear time */
 	  	des_block adv_xtime;		/* crypt time */
 	} adv_time_u;
-  //u_long adv_int_u;
+  /*u_long adv_int_u;*/
   u_int32_t adv_int_u;
 };
 
diff --git a/tirpc/rpc/clnt.h b/tirpc/rpc/clnt.h
index 0b26189..e7bb43f 100644
--- a/tirpc/rpc/clnt.h
+++ b/tirpc/rpc/clnt.h
@@ -42,8 +42,7 @@
 #ifndef _TIRPC_CLNT_H_
 #define _TIRPC_CLNT_H_
 
-//#include <rpc/clnt_stat.h>
-#include "clnt_stat.h"
+#include <rpc/clnt_stat.h>
 #include <rpc/auth.h>
 
 #include <sys/cdefs.h>
diff --git a/tirpc/rpc/rpcent.h b/tirpc/rpc/rpcent.h
index 1d83550..7fd93d9 100644
--- a/tirpc/rpc/rpcent.h
+++ b/tirpc/rpc/rpcent.h
@@ -44,23 +44,27 @@
 /*	#pragma ident "@(#)rpcent.h   1.13    94/04/25 SMI"	*/
 /*      @(#)rpcent.h 1.1 88/12/06 SMI   */
 
+__BEGIN_DECLS
 
-//struct rpcent {
-//      char    *r_name;        /* name of server for this rpc program */
-//      char    **r_aliases;    /* alias list */
-//      int     r_number;       /* rpc program number */
-//};
+/* These are defined in /usr/include/rpc/netdb.h */
+#if 0
+struct rpcent {
+	char	*r_name;	/* name of server for this rpc program */
+	char	**r_aliases;	/* alias list */
+	int	r_number;	/* rpc program number */
+};
 
-__BEGIN_DECLS
-//extern struct rpcent *getrpcbyname_r(const char *, struct rpcent *,
-//				     char *, int);
-//extern struct rpcent *getrpcbynumber_r(int, struct rpcent *, char *, int);
-//extern struct rpcent *getrpcent_r(struct rpcent *, char *, int);
+extern struct rpcent *getrpcbyname_r(const char *, struct rpcent *,
+					char *, int);
+extern struct rpcent *getrpcbynumber_r(int, struct rpcent *, char *, int);
+extern struct rpcent *getrpcent_r(struct rpcent *, char *, int);
 
 /* Old interfaces that return a pointer to a static area;  MT-unsafe */
-//extern struct rpcent *getrpcbyname(char *);
-//extern struct rpcent *getrpcbynumber(int);
-//extern struct rpcent *getrpcent(void);
+extern struct rpcent *getrpcbyname(char *);
+extern struct rpcent *getrpcbynumber(int);
+extern struct rpcent *getrpcent(void);
+#endif
+
 extern void setrpcent(int) __THROW;
 extern void endrpcent(void) __THROW;
 __END_DECLS
diff --git a/tirpc/rpc/types.h b/tirpc/rpc/types.h
index d99a57b..52c30a2 100644
--- a/tirpc/rpc/types.h
+++ b/tirpc/rpc/types.h
@@ -39,7 +39,6 @@
 #define _TIRPC_TYPES_H
 
 #include <sys/types.h>
-//#include <sys/_null.h>
 
 typedef int32_t bool_t;
 typedef int32_t enum_t;
diff --git a/tirpc/rpc/xdr.h b/tirpc/rpc/xdr.h
index 3a6bc96..2c2a860 100644
--- a/tirpc/rpc/xdr.h
+++ b/tirpc/rpc/xdr.h
@@ -43,7 +43,7 @@
 #include <sys/cdefs.h>
 #include <stdio.h>
 #include <netinet/in.h>
-// Rajout pour la définition des types
+
 #include <rpc/types.h>
 
 /*