Don't conditionalize prototypes; delete macros supporting it. (Maybe overdone;

don't worry about restoring them when importing new versions of code.)

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@13792 dc483132-0cff-0310-8789-dd5450dbe970

6 files changed, 75 insertions, 105 deletions

diff --git a/src/lib/rpc/ChangeLog b/src/lib/rpc/ChangeLog
index f829ce764..ca3f0a49b 100644
--- a/src/lib/rpc/ChangeLog
+++ b/src/lib/rpc/ChangeLog
@@ -1,3 +1,9 @@
+2001-10-09  Ken Raeburn  <raeburn@mit.edu>
+
+	* auth_gssapi.h, auth_gssapi_misc.c, getrpcent.c,
+	svc_auth_gssapi.c, xdr.h: Make prototypes unconditional.  Don't
+	define PROTOTYPE.
+
 2001-10-05  Ken Raeburn  <raeburn@mit.edu>
 
 	* auth_gssapi.h, getrpcent.c, xdr.h: Drop _MSDOS support.
diff --git a/src/lib/rpc/auth_gssapi.h b/src/lib/rpc/auth_gssapi.h
index 3f5c030d6..b3d4dc49e 100644
--- a/src/lib/rpc/auth_gssapi.h
+++ b/src/lib/rpc/auth_gssapi.h
@@ -23,17 +23,6 @@
 #undef minor
 #endif
 
-/*
- * Make sure we have a definition for PROTOTYPE.
- */
-#if !defined(PROTOTYPE)
-#if defined(__STDC__) || defined(_WIN32) || defined(__ultrix)
-#define PROTOTYPE(x) x
-#else
-#define PROTOTYPE(x) ()
-#endif
-#endif
-
 typedef struct _auth_gssapi_name {
      char *name;
      gss_OID type;
@@ -59,23 +48,23 @@ typedef struct _auth_gssapi_init_res {
 } auth_gssapi_init_res;
 
 typedef void (*auth_gssapi_log_badauth_func)
-     PROTOTYPE((OM_uint32 major,
+     (OM_uint32 major,
 		OM_uint32 minor,
 		struct sockaddr_in *raddr,
-		caddr_t data));
+		caddr_t data);
    
 typedef void (*auth_gssapi_log_badverf_func)
-     PROTOTYPE((gss_name_t client,
+     (gss_name_t client,
 		gss_name_t server,
 		struct svc_req *rqst,
 		struct rpc_msg *msg,
-		caddr_t data));
+		caddr_t data);
 
 typedef void (*auth_gssapi_log_miscerr_func)
-     PROTOTYPE((struct svc_req *rqst,
+     (struct svc_req *rqst,
 		struct rpc_msg *msg,
 		char *error,
-		caddr_t data));
+		caddr_t data);
 
 bool_t xdr_gss_buf(XDR *, gss_buffer_t);
 bool_t xdr_authgssapi_creds(XDR *, auth_gssapi_creds *);
@@ -83,18 +72,18 @@ bool_t xdr_authgssapi_init_arg(XDR *, auth_gssapi_init_arg *);
 bool_t xdr_authgssapi_init_res(XDR *, auth_gssapi_init_res *);
 
 bool_t auth_gssapi_wrap_data
-PROTOTYPE((OM_uint32 *major, OM_uint32 *minor,
+(OM_uint32 *major, OM_uint32 *minor,
 	   gss_ctx_id_t context, rpc_u_int32 seq_num, XDR
 	   *out_xdrs, bool_t (*xdr_func)(), caddr_t
-	   xdr_ptr));
+	   xdr_ptr);
 bool_t auth_gssapi_unwrap_data
-PROTOTYPE((OM_uint32 *major, OM_uint32 *minor,
+(OM_uint32 *major, OM_uint32 *minor,
 	   gss_ctx_id_t context, rpc_u_int32 seq_num, XDR
 	   *in_xdrs, bool_t (*xdr_func)(), caddr_t
-	   xdr_ptr));
+	   xdr_ptr);
 
 AUTH *auth_gssapi_create
-PROTOTYPE((CLIENT *clnt,
+(CLIENT *clnt,
 	   OM_uint32 *major_status,
 	   OM_uint32 *minor_status,
 	   gss_cred_id_t claimant_cred_handle,
@@ -104,35 +93,35 @@ PROTOTYPE((CLIENT *clnt,
 	   OM_uint32 time_req,
 	   gss_OID *actual_mech_type,
 	   OM_uint32 *ret_flags,
-	   OM_uint32 *time_rec));
+	   OM_uint32 *time_rec);
 
 AUTH *auth_gssapi_create_default
-PROTOTYPE((CLIENT *clnt, char *service_name));
+(CLIENT *clnt, char *service_name);
 
 void auth_gssapi_display_status
-PROTOTYPE((char *msg, OM_uint32 major,
-	   OM_uint32 minor)); 
+(char *msg, OM_uint32 major,
+	   OM_uint32 minor); 
 
 bool_t auth_gssapi_seal_seq
-PROTOTYPE((gss_ctx_id_t context, rpc_u_int32 seq_num, gss_buffer_t out_buf));
+(gss_ctx_id_t context, rpc_u_int32 seq_num, gss_buffer_t out_buf);
 
 bool_t auth_gssapi_unseal_seq
-PROTOTYPE((gss_ctx_id_t context, gss_buffer_t in_buf, rpc_u_int32 *seq_num));
+(gss_ctx_id_t context, gss_buffer_t in_buf, rpc_u_int32 *seq_num);
 
 bool_t _svcauth_gssapi_set_names
-PROTOTYPE((auth_gssapi_name *names, int num));
+(auth_gssapi_name *names, int num);
 void _svcauth_gssapi_unset_names
-PROTOTYPE((void));
+(void);
 
 void _svcauth_gssapi_set_log_badauth_func
-PROTOTYPE((auth_gssapi_log_badauth_func func,
-	   caddr_t data));
+(auth_gssapi_log_badauth_func func,
+	   caddr_t data);
 void _svcauth_gssapi_set_log_badverf_func
-PROTOTYPE((auth_gssapi_log_badverf_func func,
-	   caddr_t data));
+(auth_gssapi_log_badverf_func func,
+	   caddr_t data);
 void _svcauth_gssapi_set_log_miscerr_func
-PROTOTYPE((auth_gssapi_log_miscerr_func func,
-	   caddr_t data));
+(auth_gssapi_log_miscerr_func func,
+	   caddr_t data);
 
 #define GSS_COPY_BUFFER(dest, src) { \
      (dest).length = (src).length; \
diff --git a/src/lib/rpc/auth_gssapi_misc.c b/src/lib/rpc/auth_gssapi_misc.c
index f1110132a..00420aa6f 100644
--- a/src/lib/rpc/auth_gssapi_misc.c
+++ b/src/lib/rpc/auth_gssapi_misc.c
@@ -26,7 +26,7 @@ int misc_debug_gssapi = DEBUG_GSSAPI;
 #endif
    
 static void auth_gssapi_display_status_1
-	PROTOTYPE((char *, OM_uint32, int, int));
+	(char *, OM_uint32, int, int);
    
 bool_t xdr_gss_buf(xdrs, buf)
    XDR *xdrs;
diff --git a/src/lib/rpc/getrpcent.c b/src/lib/rpc/getrpcent.c
index 1b22b530d..08ad02db9 100644
--- a/src/lib/rpc/getrpcent.c
+++ b/src/lib/rpc/getrpcent.c
@@ -43,21 +43,8 @@ static  char sccsid[] = "@(#)getrpcent.c 1.9 87/08/11  Copyr 1984 Sun Micro";
 #include <string.h>
 #include <sys/socket.h>
 
-/*
- * Make sure we have a definition for PROTOTYPE.
- */
-#if !defined(PROTOTYPE)
-#if defined(__STDC__) || defined(_WIN32) || defined(__ultrix)
-#define PROTOTYPE(x) x
-#else
-#define PROTOTYPE(x) ()
-#endif
-#endif
-
-SETRPCENT_TYPE setrpcent
-PROTOTYPE((int));
-ENDRPCENT_TYPE endrpcent
-PROTOTYPE((void));
+SETRPCENT_TYPE setrpcent (int);
+ENDRPCENT_TYPE endrpcent (void);
 
 /*
  * Internet version.
diff --git a/src/lib/rpc/svc_auth_gssapi.c b/src/lib/rpc/svc_auth_gssapi.c
index af52e8e9b..5473815d4 100644
--- a/src/lib/rpc/svc_auth_gssapi.c
+++ b/src/lib/rpc/svc_auth_gssapi.c
@@ -77,14 +77,13 @@ static bool_t	svc_auth_gssapi_wrap(SVCAUTH *, XDR *, xdrproc_t, caddr_t);
 static bool_t	svc_auth_gssapi_unwrap(SVCAUTH *, XDR *, xdrproc_t, caddr_t);
 static svc_auth_gssapi_data *create_client(void);
 static svc_auth_gssapi_data *get_client
-       PROTOTYPE((gss_buffer_t client_handle));
+       (gss_buffer_t client_handle);
 static void destroy_client
-       PROTOTYPE((svc_auth_gssapi_data *client_data));
+       (svc_auth_gssapi_data *client_data);
 static void clean_client(void), cleanup(void);
 static void client_expire
-       PROTOTYPE((svc_auth_gssapi_data *client_data, rpc_u_int32 exp));
-static void dump_db
-PROTOTYPE((char *msg));
+       (svc_auth_gssapi_data *client_data, rpc_u_int32 exp);
+static void dump_db (char *msg);
 
 struct svc_auth_ops svc_auth_gssapi_ops = {
      svc_auth_gssapi_wrap,
diff --git a/src/lib/rpc/xdr.h b/src/lib/rpc/xdr.h
index b94984dc7..9181fc7a1 100644
--- a/src/lib/rpc/xdr.h
+++ b/src/lib/rpc/xdr.h
@@ -42,17 +42,6 @@
 #include <stdio.h>
 
 /*
- * Make sure we have a definition for PROTOTYPE.
- */
-#if !defined(PROTOTYPE)
-#if defined(__STDC__) || defined(_WIN32) || defined(__ultrix)
-#define PROTOTYPE(x) x
-#else
-#define PROTOTYPE(x) ()
-#endif
-#endif
-
-/*
  * XDR provides a conventional way for converting between C data
  * types and an external bit-string representation.  Library supplied
  * routines provide for the conversion on built-in C data types.  These
@@ -277,47 +266,47 @@ struct xdr_discrim {
 
 extern bool_t	xdr_void(XDR *, void *);
 extern bool_t	xdr_int
-PROTOTYPE((XDR *, int *));
+(XDR *, int *);
 extern bool_t	xdr_u_int
-PROTOTYPE((XDR *, unsigned int *));
+(XDR *, unsigned int *);
 extern bool_t	xdr_long
-PROTOTYPE((XDR *, long *));
+(XDR *, long *);
 extern bool_t	xdr_u_long
-PROTOTYPE((XDR *, unsigned long *));
+(XDR *, unsigned long *);
 extern bool_t	xdr_short
-PROTOTYPE((XDR *, short *));
+(XDR *, short *);
 extern bool_t	xdr_u_short
-PROTOTYPE((XDR *, unsigned short *));
+(XDR *, unsigned short *);
 extern bool_t	xdr_bool
-PROTOTYPE((XDR *, bool_t *));
+(XDR *, bool_t *);
 extern bool_t	xdr_enum
-PROTOTYPE((XDR *, enum_t *));
+(XDR *, enum_t *);
 extern bool_t	xdr_array
-PROTOTYPE((XDR *, caddr_t *, unsigned int*, unsigned int, unsigned int, xdrproc_t));
+(XDR *, caddr_t *, unsigned int*, unsigned int, unsigned int, xdrproc_t);
 extern bool_t	xdr_bytes
-PROTOTYPE((XDR *, char **, unsigned int *, unsigned int));
+(XDR *, char **, unsigned int *, unsigned int);
 extern bool_t	xdr_opaque
-PROTOTYPE((XDR *, caddr_t, unsigned int));
+(XDR *, caddr_t, unsigned int);
 extern bool_t	xdr_string
-PROTOTYPE((XDR *, char **, unsigned int));
+(XDR *, char **, unsigned int);
 extern bool_t	xdr_union
-PROTOTYPE((XDR *, enum_t *, char *, struct xdr_discrim *, xdrproc_t));
+(XDR *, enum_t *, char *, struct xdr_discrim *, xdrproc_t);
 extern bool_t	xdr_char
-PROTOTYPE((XDR *, char *));
+(XDR *, char *);
 extern bool_t	xdr_u_char
-PROTOTYPE((XDR *, unsigned char *));
+(XDR *, unsigned char *);
 extern bool_t	xdr_vector
-PROTOTYPE((XDR *, char *, unsigned int, unsigned int, xdrproc_t));
+(XDR *, char *, unsigned int, unsigned int, xdrproc_t);
 extern bool_t	xdr_float
-PROTOTYPE((XDR *, float *));
+(XDR *, float *);
 extern bool_t	xdr_double
-PROTOTYPE((XDR *, double *));
+(XDR *, double *);
 extern bool_t	xdr_reference
-PROTOTYPE((XDR *, caddr_t *, unsigned int, xdrproc_t));
+(XDR *, caddr_t *, unsigned int, xdrproc_t);
 extern bool_t	xdr_pointer
-PROTOTYPE((XDR *, char **, unsigned int, xdrproc_t));
+(XDR *, char **, unsigned int, xdrproc_t);
 extern bool_t	xdr_wrapstring
-PROTOTYPE((XDR *, char **));
+(XDR *, char **);
 
 /*
  * Common opaque bytes objects used by many rpc protocols;
@@ -334,12 +323,12 @@ struct netobj {
 };
 typedef struct netobj netobj;
 extern bool_t   xdr_netobj
-PROTOTYPE((XDR *, struct netobj *));
+(XDR *, struct netobj *);
 
 extern bool_t	xdr_int32
-PROTOTYPE((XDR *, rpc_int32 *));
+(XDR *, rpc_int32 *);
 extern bool_t	xdr_u_int32
-PROTOTYPE((XDR *, rpc_u_int32 *));
+(XDR *, rpc_u_int32 *);
 
 /*
  * These are the public routines for the various implementations of
@@ -356,37 +345,37 @@ PROTOTYPE((XDR *, rpc_u_int32 *));
 #define xdralloc_getdata	gssrpc_xdralloc_getdata
 
 /* XDR allocating memory buffer */
-extern void   xdralloc_create PROTOTYPE((XDR *xdrs, enum xdr_op op));	
+extern void   xdralloc_create (XDR *xdrs, enum xdr_op op);	
 
 /* destroy xdralloc, save buf */
-extern void   xdralloc_release PROTOTYPE((XDR *xdrs));	
+extern void   xdralloc_release (XDR *xdrs);	
 
 /* get buffer from xdralloc */
-extern caddr_t xdralloc_getdata PROTOTYPE((XDR *xdrs));	
+extern caddr_t xdralloc_getdata (XDR *xdrs);	
 
 /* XDR using memory buffers */
-extern void xdrmem_create PROTOTYPE((XDR *xdrs, caddr_t addr,
-				     unsigned int size, enum xdr_op xop));
+extern void xdrmem_create (XDR *xdrs, caddr_t addr,
+				     unsigned int size, enum xdr_op xop);
 
 /* XDR using stdio library */
-extern void xdrstdio_create PROTOTYPE((XDR *xdrs, FILE *file,
-					enum xdr_op op));
+extern void xdrstdio_create (XDR *xdrs, FILE *file,
+					enum xdr_op op);
 
 /* XDR pseudo records for tcp */
-extern void xdrrec_create PROTOTYPE((XDR *xdrs, unsigned int sendsize,
+extern void xdrrec_create (XDR *xdrs, unsigned int sendsize,
 				     unsigned int recvsize, caddr_t tcp_handle,
 				     int (*readit) (caddr_t, caddr_t, int),
-				     int (*writeit) (caddr_t, caddr_t, int)));
+				     int (*writeit) (caddr_t, caddr_t, int));
 
 /* make end of xdr record */
-extern bool_t xdrrec_endofrecord PROTOTYPE((XDR *xdrs, bool_t sendnow));
+extern bool_t xdrrec_endofrecord (XDR *xdrs, bool_t sendnow);
 
 /* move to beginning of next record */
-extern bool_t xdrrec_skiprecord PROTOTYPE((XDR *xdrs));
+extern bool_t xdrrec_skiprecord (XDR *xdrs);
 
 /* true if no more input */
-extern bool_t xdrrec_eof PROTOTYPE((XDR *xdrs));
+extern bool_t xdrrec_eof (XDR *xdrs);
 
 /* free memory buffers for xdr */
-extern void gssrpc_xdr_free PROTOTYPE((xdrproc_t proc, void *__objp));
+extern void gssrpc_xdr_free (xdrproc_t proc, void *__objp);
 #endif /* !__XDR_HEADER__ */