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, 86 insertions, 82 deletions

diff --git a/src/kadmin/dbutil/ChangeLog b/src/kadmin/dbutil/ChangeLog
index c753a2c..e8d5c24 100644
--- a/src/kadmin/dbutil/ChangeLog
+++ b/src/kadmin/dbutil/ChangeLog
@@ -1,3 +1,8 @@
+2001-10-09  Ken Raeburn  <raeburn@mit.edu>
+
+	* dump.c, kdb5_create.c, kdb5_util.h, loadv4.c, tcl_wrapper.c:
+	Make prototypes unconditional.
+
 2001-07-16  Ken Raeburn  <raeburn@mit.edu>
 
 	* string_table.c (str_INITING_KCONTEXT): Variable deleted.
diff --git a/src/kadmin/dbutil/dump.c b/src/kadmin/dbutil/dump.c
index fbc8837..0a6f57f 100644
--- a/src/kadmin/dbutil/dump.c
+++ b/src/kadmin/dbutil/dump.c
@@ -66,37 +66,37 @@ struct dump_args {
     int			verbose;
 };
 
-static krb5_error_code dump_k5beta_iterator PROTOTYPE((krb5_pointer,
-						       krb5_db_entry *));
-static krb5_error_code dump_k5beta6_iterator PROTOTYPE((krb5_pointer,
-							krb5_db_entry *));
-static krb5_error_code dump_k5beta6_iterator_ext PROTOTYPE((krb5_pointer,
-							    krb5_db_entry *,
-							    int));
-static krb5_error_code dump_k5beta7_princ PROTOTYPE((krb5_pointer,
-						     krb5_db_entry *));
-static krb5_error_code dump_k5beta7_princ_ext PROTOTYPE((krb5_pointer,
-							 krb5_db_entry *,
-							 int));
+static krb5_error_code dump_k5beta_iterator (krb5_pointer,
+					     krb5_db_entry *);
+static krb5_error_code dump_k5beta6_iterator (krb5_pointer,
+					      krb5_db_entry *);
+static krb5_error_code dump_k5beta6_iterator_ext (krb5_pointer,
+						  krb5_db_entry *,
+						  int);
+static krb5_error_code dump_k5beta7_princ (krb5_pointer,
+					   krb5_db_entry *);
+static krb5_error_code dump_k5beta7_princ_ext (krb5_pointer,
+					       krb5_db_entry *,
+					       int);
 static krb5_error_code dump_k5beta7_princ_withpolicy
-			PROTOTYPE((krb5_pointer, krb5_db_entry *));
-static krb5_error_code dump_ov_princ PROTOTYPE((krb5_pointer,
-						krb5_db_entry *));
-static void dump_k5beta7_policy PROTOTYPE((void *, osa_policy_ent_t));
-
-typedef krb5_error_code (*dump_func)PROTOTYPE((krb5_pointer,
-					       krb5_db_entry *));
-
-static int process_k5beta_record PROTOTYPE((char *, krb5_context,
-					    FILE *, int, int *, void *));
-static int process_k5beta6_record PROTOTYPE((char *, krb5_context,
-					     FILE *, int, int *, void *));
-static int process_k5beta7_record PROTOTYPE((char *, krb5_context,
-					     FILE *, int, int *, void *));
-static int process_ov_record PROTOTYPE((char *, krb5_context,
-					FILE *, int, int *, void *));
-typedef krb5_error_code (*load_func)PROTOTYPE((char *, krb5_context,
-					       FILE *, int, int *, void *));
+			(krb5_pointer, krb5_db_entry *);
+static krb5_error_code dump_ov_princ (krb5_pointer,
+				      krb5_db_entry *);
+static void dump_k5beta7_policy (void *, osa_policy_ent_t);
+
+typedef krb5_error_code (*dump_func)(krb5_pointer,
+				     krb5_db_entry *);
+
+static int process_k5beta_record (char *, krb5_context,
+				  FILE *, int, int *, void *);
+static int process_k5beta6_record (char *, krb5_context,
+				   FILE *, int, int *, void *);
+static int process_k5beta7_record (char *, krb5_context,
+				   FILE *, int, int *, void *);
+static int process_ov_record (char *, krb5_context,
+			      FILE *, int, int *, void *);
+typedef krb5_error_code (*load_func)(char *, krb5_context,
+				     FILE *, int, int *, void *);
 
 typedef struct _dump_version {
      char *name;
diff --git a/src/kadmin/dbutil/kdb5_create.c b/src/kadmin/dbutil/kdb5_create.c
index c6ff334..74210ab 100644
--- a/src/kadmin/dbutil/kdb5_create.c
+++ b/src/kadmin/dbutil/kdb5_create.c
@@ -93,10 +93,10 @@ struct iterate_args {
 };
 
 static krb5_error_code add_principal 
-	PROTOTYPE((krb5_context,
-		   krb5_principal, 
-		   enum ap_op,
-		   struct realm_info *));
+	(krb5_context,
+	 krb5_principal,
+	 enum ap_op,
+	 struct realm_info *);
 
 /*
  * Steps in creating a database:
diff --git a/src/kadmin/dbutil/kdb5_util.h b/src/kadmin/dbutil/kdb5_util.h
index 8c72754..c63ca03 100644
--- a/src/kadmin/dbutil/kdb5_util.h
+++ b/src/kadmin/dbutil/kdb5_util.h
@@ -44,43 +44,43 @@ extern krb5_db_entry master_db;
 extern void usage(void);
 
 extern void add_key 
-	PROTOTYPE((char const *, char const *, 
+	(char const *, char const *, 
 		   krb5_const_principal, const krb5_keyblock *, 
-		   krb5_kvno, krb5_keysalt *));
+		   krb5_kvno, krb5_keysalt *);
 extern int set_dbname_help
-	PROTOTYPE((char *, char *));
+	(char *, char *);
 
-extern char *kdb5_util_Init PROTOTYPE((int, char **));
+extern char *kdb5_util_Init (int, char **);
 
-extern int quit PROTOTYPE((void));
+extern int quit (void);
 
 extern int check_for_match
-	PROTOTYPE((char *, int, krb5_db_entry *, int, int));
+	(char *, int, krb5_db_entry *, int, int);
 
 extern void parse_token
-	PROTOTYPE((char *, int *, int *, char *));
+	(char *, int *, int *, char *);
 
-extern int create_db_entry PROTOTYPE((krb5_principal, krb5_db_entry *));
+extern int create_db_entry (krb5_principal, krb5_db_entry *);
 
-extern int kadm5_create_magic_princs PROTOTYPE((kadm5_config_params *params,
-						krb5_context context));
+extern int kadm5_create_magic_princs (kadm5_config_params *params,
+						krb5_context context);
 
-extern int process_ov_principal PROTOTYPE((char *fname, krb5_context kcontext, 
+extern int process_ov_principal (char *fname, krb5_context kcontext, 
 					   FILE *filep, int verbose, 
 					   int *linenop,
-					   void *pol_db));
+					   void *pol_db);
 
-extern void load_db PROTOTYPE((int argc, char **argv));
-extern void dump_db PROTOTYPE((int argc, char **argv));
-extern void load_v4db PROTOTYPE((int argc, char **argv));
-extern void dump_v4db PROTOTYPE((int argc, char **argv));
-extern void kdb5_create PROTOTYPE((int argc, char **argv));
-extern void kdb5_destroy PROTOTYPE((int argc, char **argv));
-extern void kdb5_stash PROTOTYPE((int argc, char **argv));
+extern void load_db (int argc, char **argv);
+extern void dump_db (int argc, char **argv);
+extern void load_v4db (int argc, char **argv);
+extern void dump_v4db (int argc, char **argv);
+extern void kdb5_create (int argc, char **argv);
+extern void kdb5_destroy (int argc, char **argv);
+extern void kdb5_stash (int argc, char **argv);
 
-extern void update_ok_file PROTOTYPE((char *file_name));
+extern void update_ok_file (char *file_name);
 
-extern int kadm5_create PROTOTYPE((kadm5_config_params *params));
+extern int kadm5_create (kadm5_config_params *params);
 
-void usage PROTOTYPE((void));
+void usage (void);
 
diff --git a/src/kadmin/dbutil/loadv4.c b/src/kadmin/dbutil/loadv4.c
index a93f7aa..197d4bf 100644
--- a/src/kadmin/dbutil/loadv4.c
+++ b/src/kadmin/dbutil/loadv4.c
@@ -107,19 +107,19 @@ static int verbose = 0;
 static int shortlife = 0;
 
 static krb5_error_code add_principal 
-	PROTOTYPE((krb5_context,
+		  (krb5_context,
 		   krb5_principal, 
 		   enum ap_op,
-		   struct realm_info *));
-
-static int v4init PROTOTYPE((char *, int, char *));
-static krb5_error_code enter_in_v5_db PROTOTYPE((krb5_context,
-						 char *, Principal *));
-static krb5_error_code process_v4_dump PROTOTYPE((krb5_context, char *,
-						  char *, long));
-static krb5_error_code v4_dump_find_default PROTOTYPE((krb5_context, char *,
-						       char *, long *));
-static krb5_error_code fixup_database PROTOTYPE((krb5_context, char *));
+		   struct realm_info *);
+
+static int v4init (char *, int, char *);
+static krb5_error_code enter_in_v5_db (krb5_context,
+				       char *, Principal *);
+static krb5_error_code process_v4_dump (krb5_context, char *,
+					char *, long);
+static krb5_error_code v4_dump_find_default (krb5_context, char *,
+					     char *, long *);
+static krb5_error_code fixup_database (krb5_context, char *);
 	
 static int create_local_tgt = 0;
 
diff --git a/src/kadmin/dbutil/tcl_wrapper.c b/src/kadmin/dbutil/tcl_wrapper.c
index ab4f25b..16721ae 100644
--- a/src/kadmin/dbutil/tcl_wrapper.c
+++ b/src/kadmin/dbutil/tcl_wrapper.c
@@ -40,8 +40,7 @@
     Tcl_Interp * interp;\
     int argc;\
     char ** argv;
-#define CMDPROTO(x) int x PROTOTYPE((ClientData, Tcl_Interp,\
-				     int, char **))
+#define CMDPROTO(x) int x (ClientData, Tcl_Interp, int, char **)
 #define MKCMD(name,cmd) Tcl_CreateCommand(interp, name, cmd,\
 					 (ClientData)NULL,\
 					 (Tcl_CmdDeleteProc *)NULL)
@@ -53,19 +52,19 @@ extern Tcl_Interp *interp;	/* XXX yes, this is gross,
 				   but we do need it for some things */
 extern int exit_status;
 
-void show_principal PROTOTYPE((int, char **));
-void add_new_key PROTOTYPE((int, char **));
-void change_pwd_key PROTOTYPE((int, char **));
-void add_rnd_key PROTOTYPE((int, char **));
-void change_rnd_key PROTOTYPE((int, char **));
-void delete_entry PROTOTYPE((int, char **));
-void extract_srvtab PROTOTYPE((krb5_context, int, char **));
-void extract_v4_srvtab PROTOTYPE((int, char **));
-void list_db PROTOTYPE((int, char **));
-void dump_db PROTOTYPE((int, char **));
-void load_db PROTOTYPE((int, char **));
-void set_dbname PROTOTYPE((krb5_context, int, char **));
-void enter_master_key PROTOTYPE((krb5_context, int, char **));
+void show_principal (int, char **);
+void add_new_key (int, char **);
+void change_pwd_key (int, char **);
+void add_rnd_key (int, char **);
+void change_rnd_key (int, char **);
+void delete_entry (int, char **);
+void extract_srvtab (krb5_context, int, char **);
+void extract_v4_srvtab (int, char **);
+void list_db (int, char **);
+void dump_db (int, char **);
+void load_db (int, char **);
+void set_dbname (krb5_context, int, char **);
+void enter_master_key (krb5_context, int, char **);
 
 /*
  * this is mostly stolen from tcl_ExitCmd()