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

8 files changed, 96 insertions, 87 deletions

diff --git a/src/clients/klist/ChangeLog b/src/clients/klist/ChangeLog
index 5c78e65e1..febc9cb88 100644
--- a/src/clients/klist/ChangeLog
+++ b/src/clients/klist/ChangeLog
@@ -1,3 +1,7 @@
+2001-10-09  Ken Raeburn  <raeburn@mit.edu>
+
+	* klist.c: Make prototypes unconditional.
+
 2001-10-05  Ken Raeburn  <raeburn@mit.edu>
 
 	* klist.c: Delete _MSDOS support.
diff --git a/src/clients/klist/klist.c b/src/clients/klist/klist.c
index 548a3822b..4e3c4a593 100644
--- a/src/clients/klist/klist.c
+++ b/src/clients/klist/klist.c
@@ -67,17 +67,17 @@ unsigned int timestamp_width;
 
 krb5_context kcontext;
 
-char * etype_string KRB5_PROTOTYPE((krb5_enctype ));
-void show_credential KRB5_PROTOTYPE((krb5_creds *));
+char * etype_string (krb5_enctype );
+void show_credential (krb5_creds *);
 	
-void do_ccache KRB5_PROTOTYPE((char *));
-void do_keytab KRB5_PROTOTYPE((char *));
-void printtime KRB5_PROTOTYPE((time_t));
-void one_addr KRB5_PROTOTYPE((krb5_address *));
-void fillit KRB5_PROTOTYPE((FILE *, unsigned int, int));
+void do_ccache (char *);
+void do_keytab (char *);
+void printtime (time_t);
+void one_addr (krb5_address *);
+void fillit (FILE *, unsigned int, int);
 
 #ifdef KRB5_KRB4_COMPAT
-void do_v4_ccache KRB5_PROTOTYPE((char *));
+void do_v4_ccache (char *);
 #endif /* KRB5_KRB4_COMPAT */
 
 #define DEFAULT 0
diff --git a/src/clients/ksu/ChangeLog b/src/clients/ksu/ChangeLog
index 6cba8c770..33ee0fa9a 100644
--- a/src/clients/ksu/ChangeLog
+++ b/src/clients/ksu/ChangeLog
@@ -1,3 +1,8 @@
+2001-10-09  Ken Raeburn  <raeburn@mit.edu>
+
+	* authorization.c, heuristic.c, krb_auth_su.c, ksu.h, main.c: Make
+	prototypes unconditional.
+
 2001-10-07  Mitchell Berger  <mitchb@mit.edu>
 
 	* krb_auth_su.c: Fix a call to plain_dump_principal() that had the
diff --git a/src/clients/ksu/authorization.c b/src/clients/ksu/authorization.c
index 67cc78776..f932368ea 100644
--- a/src/clients/ksu/authorization.c
+++ b/src/clients/ksu/authorization.c
@@ -27,7 +27,7 @@
 
 #include "ksu.h"
 
-static void auth_cleanup PROTOTYPE((FILE *, FILE *, char *));
+static void auth_cleanup (FILE *, FILE *, char *);
 
 krb5_boolean fowner(fp, uid)
     FILE *fp;
diff --git a/src/clients/ksu/heuristic.c b/src/clients/ksu/heuristic.c
index 471184d7e..c17496bf4 100644
--- a/src/clients/ksu/heuristic.c
+++ b/src/clients/ksu/heuristic.c
@@ -37,8 +37,8 @@ get_all_princ_from_file - retrieves all principal names
 			from file pointed to by fp.
 
 *******************************************************************/
-static void close_time PROTOTYPE((int, FILE *, int, FILE *));
-static krb5_boolean find_str_in_list PROTOTYPE((char **, char *));
+static void close_time (int, FILE *, int, FILE *);
+static krb5_boolean find_str_in_list (char **, char *);
 
 krb5_error_code get_all_princ_from_file (fp, plist)
     FILE *fp;
diff --git a/src/clients/ksu/krb_auth_su.c b/src/clients/ksu/krb_auth_su.c
index 1771e4b6f..6e76149c1 100644
--- a/src/clients/ksu/krb_auth_su.c
+++ b/src/clients/ksu/krb_auth_su.c
@@ -28,12 +28,12 @@
 #include "ksu.h"
     
 static krb5_error_code krb5_verify_tkt_def
-	PROTOTYPE((krb5_context,
+		  (krb5_context,
     		   krb5_principal,
     		   krb5_principal,
     		   krb5_keyblock *,
     		   krb5_data *,
-    		   krb5_ticket **));
+    		   krb5_ticket **);
 
 void plain_dump_principal ();
 
diff --git a/src/clients/ksu/ksu.h b/src/clients/ksu/ksu.h
index f0623cc4f..4c3f6afee 100644
--- a/src/clients/ksu/ksu.h
+++ b/src/clients/ksu/ksu.h
@@ -79,164 +79,164 @@ typedef struct opt_info{
 
 /* krb_auth_su.c */
 extern krb5_boolean krb5_auth_check
-        PROTOTYPE((krb5_context, krb5_principal, char *, opt_info *,
-		   char *, krb5_ccache, int *, uid_t));
+        (krb5_context, krb5_principal, char *, opt_info *,
+		   char *, krb5_ccache, int *, uid_t);
 
 extern krb5_boolean krb5_fast_auth
-        PROTOTYPE((krb5_context, krb5_principal, krb5_principal, char *,
-		   krb5_ccache));
+        (krb5_context, krb5_principal, krb5_principal, char *,
+		   krb5_ccache);
 
 extern krb5_boolean krb5_get_tkt_via_passwd 
-	PROTOTYPE((krb5_context, krb5_ccache *, krb5_principal,
-		   krb5_principal, opt_info *, krb5_boolean *));
+	(krb5_context, krb5_ccache *, krb5_principal,
+		   krb5_principal, opt_info *, krb5_boolean *);
 
 extern void dump_principal 
-	PROTOTYPE((krb5_context, char *, krb5_principal));
+	(krb5_context, char *, krb5_principal);
 
 extern void plain_dump_principal 
-	PROTOTYPE((krb5_context, krb5_principal));
+	(krb5_context, krb5_principal);
 
 
 extern krb5_error_code krb5_parse_lifetime
-	PROTOTYPE((char *, long *));
+	(char *, long *);
 
 extern krb5_error_code get_best_principal
-	PROTOTYPE((krb5_context, char **, krb5_principal *));
+	(krb5_context, char **, krb5_principal *);
 
 /* ccache.c */
 extern krb5_error_code krb5_ccache_copy
-	PROTOTYPE((krb5_context, krb5_ccache, char *, krb5_principal, 
-		   krb5_ccache *, krb5_boolean *, uid_t));
+	(krb5_context, krb5_ccache, char *, krb5_principal, 
+		   krb5_ccache *, krb5_boolean *, uid_t);
 
 extern krb5_error_code krb5_store_all_creds
-	PROTOTYPE((krb5_context, krb5_ccache, krb5_creds **, krb5_creds **));
+	(krb5_context, krb5_ccache, krb5_creds **, krb5_creds **);
 
 extern krb5_error_code krb5_store_all_creds
-	PROTOTYPE((krb5_context, krb5_ccache, krb5_creds **, krb5_creds **));
+	(krb5_context, krb5_ccache, krb5_creds **, krb5_creds **);
 
 extern krb5_boolean compare_creds
-	PROTOTYPE((krb5_context, krb5_creds *, krb5_creds *));
+	(krb5_context, krb5_creds *, krb5_creds *);
 
 extern krb5_error_code krb5_get_nonexp_tkts
-	PROTOTYPE((krb5_context, krb5_ccache, krb5_creds ***));
+	(krb5_context, krb5_ccache, krb5_creds ***);
 
 extern krb5_error_code krb5_check_exp
-	PROTOTYPE((krb5_context, krb5_ticket_times));
+	(krb5_context, krb5_ticket_times);
 
-extern char *flags_string PROTOTYPE((krb5_creds *));
+extern char *flags_string (krb5_creds *);
 
 extern krb5_error_code krb5_get_login_princ
-	PROTOTYPE((const char *, char ***));
+	(const char *, char ***);
 
 extern void show_credential
-	PROTOTYPE((krb5_context, krb5_creds *, krb5_ccache));
+	(krb5_context, krb5_creds *, krb5_ccache);
 
-extern int gen_sym PROTOTYPE((void));
+extern int gen_sym (void);
 
 extern krb5_error_code krb5_ccache_overwrite
-	PROTOTYPE((krb5_context, krb5_ccache, krb5_ccache, krb5_principal));
+	(krb5_context, krb5_ccache, krb5_ccache, krb5_principal);
 
 extern krb5_error_code krb5_store_some_creds
-	PROTOTYPE((krb5_context, krb5_ccache, krb5_creds **, krb5_creds **,
-		   krb5_principal, krb5_boolean *));
+	(krb5_context, krb5_ccache, krb5_creds **, krb5_creds **,
+		   krb5_principal, krb5_boolean *);
 
 extern krb5_error_code krb5_ccache_copy_restricted
-	PROTOTYPE((krb5_context, krb5_ccache, char *, krb5_principal, 
-		   krb5_ccache *, krb5_boolean *, uid_t));
+	(krb5_context, krb5_ccache, char *, krb5_principal, 
+		   krb5_ccache *, krb5_boolean *, uid_t);
 
 extern krb5_error_code krb5_ccache_refresh
-	PROTOTYPE((krb5_context, krb5_ccache));
+	(krb5_context, krb5_ccache);
 
 extern krb5_error_code krb5_ccache_filter
-	PROTOTYPE((krb5_context, krb5_ccache, krb5_principal));
+	(krb5_context, krb5_ccache, krb5_principal);
 
 extern krb5_boolean krb5_find_princ_in_cred_list
-	PROTOTYPE((krb5_context, krb5_creds **, krb5_principal));
+	(krb5_context, krb5_creds **, krb5_principal);
 
 extern krb5_error_code krb5_find_princ_in_cache
-	PROTOTYPE((krb5_context, krb5_ccache, krb5_principal, krb5_boolean *));
+	(krb5_context, krb5_ccache, krb5_principal, krb5_boolean *);
 
-extern void printtime PROTOTYPE((time_t));
+extern void printtime (time_t);
 
 /* authorization.c */
-extern krb5_boolean fowner PROTOTYPE((FILE *, int));
+extern krb5_boolean fowner (FILE *, int);
 
 extern krb5_error_code krb5_authorization
-	PROTOTYPE((krb5_context, krb5_principal, const char *, char *, 
-		   krb5_boolean *, char **));
+	(krb5_context, krb5_principal, const char *, char *, 
+		   krb5_boolean *, char **);
 
-extern krb5_error_code k5login_lookup PROTOTYPE((FILE *, char *,
-						 krb5_boolean *));
+extern krb5_error_code k5login_lookup (FILE *, char *,
+						 krb5_boolean *);
 
 extern krb5_error_code k5users_lookup 
-	PROTOTYPE((FILE *, char *, char *, krb5_boolean *, char **));
+	(FILE *, char *, char *, krb5_boolean *, char **);
 
 extern krb5_boolean fcmd_resolve
-	PROTOTYPE((char *, char ***, char **));
+	(char *, char ***, char **);
 
-extern krb5_boolean cmd_single PROTOTYPE((char *));
+extern krb5_boolean cmd_single (char *);
 
-extern int cmd_arr_cmp_postfix PROTOTYPE((char **, char *));
+extern int cmd_arr_cmp_postfix (char **, char *);
 
-extern int cmd_arr_cmp PROTOTYPE((char **, char *));
+extern int cmd_arr_cmp (char **, char *);
 
 extern krb5_boolean find_first_cmd_that_exists 
-	PROTOTYPE((char **, char **, char **));
+	(char **, char **, char **);
 
 extern int match_commands 
-	PROTOTYPE((char *, char *, krb5_boolean *, char **, char **));
+	(char *, char *, krb5_boolean *, char **, char **);
 
-extern krb5_error_code get_line PROTOTYPE((FILE *, char **));
+extern krb5_error_code get_line (FILE *, char **);
 
-extern char *  get_first_token PROTOTYPE((char *, char **));
+extern char *  get_first_token (char *, char **);
 
-extern char *  get_next_token PROTOTYPE((char **));
+extern char *  get_next_token (char **);
 
-extern krb5_boolean fowner PROTOTYPE((FILE *, int));
+extern krb5_boolean fowner (FILE *, int);
 
-extern void init_auth_names PROTOTYPE((char *));
+extern void init_auth_names (char *);
 
 /* main.c */
-extern void usage PROTOTYPE((void));
+extern void usage (void);
 
-extern int standard_shell PROTOTYPE((char *));
+extern int standard_shell (char *);
 
-extern krb5_error_code get_params PROTOTYPE((int *, int, char **, char ***));
+extern krb5_error_code get_params (int *, int, char **, char ***);
 
-extern char *get_dir_of_file PROTOTYPE((const char *));
+extern char *get_dir_of_file (const char *);
 
 /* heuristic.c */
-extern krb5_error_code get_all_princ_from_file PROTOTYPE((FILE *, char ***));
+extern krb5_error_code get_all_princ_from_file (FILE *, char ***);
 
-extern krb5_error_code list_union PROTOTYPE((char **, char **, char ***));
+extern krb5_error_code list_union (char **, char **, char ***);
 
-extern krb5_error_code filter PROTOTYPE((FILE *, char *, char **, char ***));
+extern krb5_error_code filter (FILE *, char *, char **, char ***);
 
 extern krb5_error_code get_authorized_princ_names
-	PROTOTYPE((const char *, char *, char ***));
+	(const char *, char *, char ***);
 
 extern krb5_error_code get_closest_principal 
-	PROTOTYPE((krb5_context, char **, krb5_principal *, krb5_boolean *));
+	(krb5_context, char **, krb5_principal *, krb5_boolean *);
 
 extern krb5_error_code find_either_ticket 
-	PROTOTYPE((krb5_context, krb5_ccache, krb5_principal,
-		krb5_principal, krb5_boolean *));
+	(krb5_context, krb5_ccache, krb5_principal,
+		krb5_principal, krb5_boolean *);
 
 extern krb5_error_code find_ticket 
-	PROTOTYPE((krb5_context, krb5_ccache, krb5_principal,
-		krb5_principal, krb5_boolean *));
+	(krb5_context, krb5_ccache, krb5_principal,
+		krb5_principal, krb5_boolean *);
 
 
 extern krb5_error_code find_princ_in_list
-	PROTOTYPE((krb5_context, krb5_principal, char **, krb5_boolean *));
+	(krb5_context, krb5_principal, char **, krb5_boolean *);
 
 extern krb5_error_code get_best_princ_for_target
-	PROTOTYPE((krb5_context, int, int, char *, char *, krb5_ccache, 
-		opt_info *, char *, char *, krb5_principal *, int *));
+	(krb5_context, int, int, char *, char *, krb5_ccache, 
+		opt_info *, char *, char *, krb5_principal *, int *);
 
-extern krb5_error_code ksu_tgtname PROTOTYPE((krb5_context, const krb5_data *,
+extern krb5_error_code ksu_tgtname (krb5_context, const krb5_data *,
 					      const krb5_data *, 
-					      krb5_principal *tgtprinc));
+					      krb5_principal *tgtprinc);
 
 #ifndef min
 #define min(a,b) ((a) > (b) ? (b) : (a))
@@ -246,11 +246,11 @@ extern krb5_error_code ksu_tgtname PROTOTYPE((krb5_context, const krb5_data *,
 extern char *krb5_lname_file;  /* Note: print this out just be sure
 				  that it gets set */   	    
 
-extern void *xmalloc PROTOTYPE((size_t)), 
-    *xrealloc PROTOTYPE((void *, size_t)), 
-    *xcalloc PROTOTYPE((size_t, size_t));
-extern char *xstrdup PROTOTYPE((const char *));
+extern void *xmalloc (size_t), 
+    *xrealloc (void *, size_t), 
+    *xcalloc (size_t, size_t);
+extern char *xstrdup (const char *);
 
 #ifndef HAVE_UNSETENV
-void unsetenv PROTOTYPE((char *));
+void unsetenv (char *);
 #endif
diff --git a/src/clients/ksu/main.c b/src/clients/ksu/main.c
index f8992a7b8..df72edfc5 100644
--- a/src/clients/ksu/main.c
+++ b/src/clients/ksu/main.c
@@ -42,9 +42,9 @@ int quiet = 0;
 /***********/
 
 #define _DEF_CSH "/bin/csh" 
-static int set_env_var PROTOTYPE((char *, char *));
-static void sweep_up PROTOTYPE((krb5_context, krb5_ccache));
-static char * ontty PROTOTYPE((void));
+static int set_env_var (char *, char *);
+static void sweep_up (krb5_context, krb5_ccache);
+static char * ontty (void);
 #ifdef HAVE_STDARG_H
 static void print_status( const char *fmt, ...)
 #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7)