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

13 files changed, 116 insertions, 95 deletions

diff --git a/src/tests/asn.1/ChangeLog b/src/tests/asn.1/ChangeLog
index 79f7c6c058..5c8f449f76 100644
--- a/src/tests/asn.1/ChangeLog
+++ b/src/tests/asn.1/ChangeLog
@@ -1,3 +1,8 @@
+2001-10-09  Ken Raeburn  <raeburn@mit.edu>
+
+	* ktest.h, ktest_equal.h, utility.c, utility.h: Make prototypes
+	unconditional.
+
 2001-07-06  Ezra Peisach  <epeisach@mit.edu>
 
 	* trval.c: Include string.h for strcmp prototype.
diff --git a/src/tests/asn.1/ktest.h b/src/tests/asn.1/ktest.h
index f1db33d89d..59e87047c6 100644
--- a/src/tests/asn.1/ktest.h
+++ b/src/tests/asn.1/ktest.h
@@ -10,138 +10,138 @@
 #define SAMPLE_FLAGS 0xFEDCBA98
 #define SAMPLE_ERROR 0x3C;
 krb5_error_code ktest_make_sample_data
-	KRB5_PROTOTYPE((krb5_data *d));
+	(krb5_data *d);
 krb5_error_code ktest_make_sample_authenticator
-	KRB5_PROTOTYPE((krb5_authenticator *a));
+	(krb5_authenticator *a);
   krb5_error_code ktest_make_sample_principal
-	KRB5_PROTOTYPE((krb5_principal *p));
+	(krb5_principal *p);
   krb5_error_code ktest_make_sample_checksum
-	KRB5_PROTOTYPE((krb5_checksum *cs));
+	(krb5_checksum *cs);
   krb5_error_code ktest_make_sample_keyblock
-	KRB5_PROTOTYPE((krb5_keyblock *kb));
+	(krb5_keyblock *kb);
 krb5_error_code ktest_make_sample_ticket
-	KRB5_PROTOTYPE((krb5_ticket *tkt));
+	(krb5_ticket *tkt);
   krb5_error_code ktest_make_sample_enc_data
-	KRB5_PROTOTYPE((krb5_enc_data *ed));
+	(krb5_enc_data *ed);
 krb5_error_code ktest_make_sample_enc_tkt_part
-	KRB5_PROTOTYPE((krb5_enc_tkt_part *etp));
+	(krb5_enc_tkt_part *etp);
   krb5_error_code ktest_make_sample_transited
-	KRB5_PROTOTYPE((krb5_transited *t));
+	(krb5_transited *t);
   krb5_error_code ktest_make_sample_ticket_times
-	KRB5_PROTOTYPE((krb5_ticket_times *tt));
+	(krb5_ticket_times *tt);
   krb5_error_code ktest_make_sample_addresses
-	KRB5_PROTOTYPE((krb5_address ***caddrs));
+	(krb5_address ***caddrs);
   krb5_error_code ktest_make_sample_address
-	KRB5_PROTOTYPE((krb5_address *a));
+	(krb5_address *a);
   krb5_error_code ktest_make_sample_authorization_data
-	KRB5_PROTOTYPE((krb5_authdata ***ad));
+	(krb5_authdata ***ad);
   krb5_error_code ktest_make_sample_authdata
-	KRB5_PROTOTYPE((krb5_authdata *ad));
+	(krb5_authdata *ad);
 krb5_error_code ktest_make_sample_enc_kdc_rep_part
-	KRB5_PROTOTYPE((krb5_enc_kdc_rep_part *ekr));
+	(krb5_enc_kdc_rep_part *ekr);
 krb5_error_code ktest_make_sample_kdc_req
-	KRB5_PROTOTYPE((krb5_kdc_req *kr));
+	(krb5_kdc_req *kr);
 
   krb5_error_code ktest_make_sample_last_req
-	KRB5_PROTOTYPE((krb5_last_req_entry ***lr));
+	(krb5_last_req_entry ***lr);
   krb5_error_code ktest_make_sample_last_req_entry
-	KRB5_PROTOTYPE((krb5_last_req_entry **lre));
+	(krb5_last_req_entry **lre);
 krb5_error_code ktest_make_sample_kdc_rep
-	KRB5_PROTOTYPE((krb5_kdc_rep *kdcr));
+	(krb5_kdc_rep *kdcr);
   krb5_error_code ktest_make_sample_pa_data_array
-	KRB5_PROTOTYPE((krb5_pa_data ***pad));
+	(krb5_pa_data ***pad);
   krb5_error_code ktest_make_sample_empty_pa_data_array
-	KRB5_PROTOTYPE((krb5_pa_data ***pad));
+	(krb5_pa_data ***pad);
   krb5_error_code ktest_make_sample_pa_data
-	KRB5_PROTOTYPE((krb5_pa_data *pad));
+	(krb5_pa_data *pad);
 krb5_error_code ktest_make_sample_ap_req
-	KRB5_PROTOTYPE((krb5_ap_req *ar));
+	(krb5_ap_req *ar);
 krb5_error_code ktest_make_sample_ap_rep
-	KRB5_PROTOTYPE((krb5_ap_rep *ar));
+	(krb5_ap_rep *ar);
 krb5_error_code ktest_make_sample_ap_rep_enc_part
-	KRB5_PROTOTYPE((krb5_ap_rep_enc_part *arep));
+	(krb5_ap_rep_enc_part *arep);
 krb5_error_code ktest_make_sample_kdc_req_body
-	KRB5_PROTOTYPE((krb5_kdc_req *krb));
+	(krb5_kdc_req *krb);
 krb5_error_code ktest_make_sample_safe
-	KRB5_PROTOTYPE((krb5_safe *s));
+	(krb5_safe *s);
 krb5_error_code ktest_make_sample_priv
-	KRB5_PROTOTYPE((krb5_priv *p));
+	(krb5_priv *p);
 krb5_error_code ktest_make_sample_priv_enc_part
-	KRB5_PROTOTYPE((krb5_priv_enc_part *pep));
+	(krb5_priv_enc_part *pep);
 krb5_error_code ktest_make_sample_cred
-	KRB5_PROTOTYPE((krb5_cred *c));
+	(krb5_cred *c);
 krb5_error_code ktest_make_sample_cred_enc_part
-	KRB5_PROTOTYPE((krb5_cred_enc_part *cep));
+	(krb5_cred_enc_part *cep);
   krb5_error_code ktest_make_sample_sequence_of_ticket
-	KRB5_PROTOTYPE((krb5_ticket ***sot));
+	(krb5_ticket ***sot);
 krb5_error_code ktest_make_sample_error
-	KRB5_PROTOTYPE((krb5_error *kerr));
+	(krb5_error *kerr);
 krb5_error_code ktest_make_sequence_of_cred_info
-	KRB5_PROTOTYPE((krb5_cred_info ***soci));
+	(krb5_cred_info ***soci);
   krb5_error_code ktest_make_sample_cred_info
-	KRB5_PROTOTYPE((krb5_cred_info *ci));
+	(krb5_cred_info *ci);
 krb5_error_code ktest_make_sample_passwd_phrase_element
-	KRB5_PROTOTYPE((passwd_phrase_element *ppe));
+	(passwd_phrase_element *ppe);
 krb5_error_code ktest_make_sample_krb5_pwd_data
-	KRB5_PROTOTYPE((krb5_pwd_data *pd));
+	(krb5_pwd_data *pd);
 krb5_error_code ktest_make_sample_alt_method
-	KRB5_PROTOTYPE((krb5_alt_method *am));
+	(krb5_alt_method *am);
 
 krb5_error_code ktest_make_sample_etype_info
-    KRB5_PROTOTYPE((krb5_etype_info_entry *** p));
+    (krb5_etype_info_entry *** p);
 krb5_error_code ktest_make_sample_pa_enc_ts
-	KRB5_PROTOTYPE((krb5_pa_enc_ts *am));
+	(krb5_pa_enc_ts *am);
 krb5_error_code ktest_make_sample_sam_challenge
-	KRB5_PROTOTYPE((krb5_sam_challenge * p));
+	(krb5_sam_challenge * p);
 krb5_error_code ktest_make_sample_sam_response
-	KRB5_PROTOTYPE((krb5_sam_response * p));
+	(krb5_sam_response * p);
 
 /*----------------------------------------------------------------------*/
 
 void ktest_empty_authorization_data
-	KRB5_PROTOTYPE((krb5_authdata **ad));
+	(krb5_authdata **ad);
 void ktest_destroy_authorization_data
-	KRB5_PROTOTYPE((krb5_authdata ***ad));
+	(krb5_authdata ***ad);
   void ktest_destroy_authorization_data
-	KRB5_PROTOTYPE((krb5_authdata ***ad));
+	(krb5_authdata ***ad);
 void ktest_empty_addresses
-	KRB5_PROTOTYPE((krb5_address **a));
+	(krb5_address **a);
 void ktest_destroy_addresses
-	KRB5_PROTOTYPE((krb5_address ***a));
+	(krb5_address ***a);
   void ktest_destroy_address
-	KRB5_PROTOTYPE((krb5_address **a));
+	(krb5_address **a);
 void ktest_empty_pa_data_array
-	KRB5_PROTOTYPE((krb5_pa_data **pad));
+	(krb5_pa_data **pad);
 void ktest_destroy_pa_data_array
-	KRB5_PROTOTYPE((krb5_pa_data ***pad));
+	(krb5_pa_data ***pad);
   void ktest_destroy_pa_data
-	KRB5_PROTOTYPE((krb5_pa_data **pad));
+	(krb5_pa_data **pad);
 
 void ktest_destroy_data
-	KRB5_PROTOTYPE((krb5_data **d));
+	(krb5_data **d);
 void ktest_empty_data
-	KRB5_PROTOTYPE((krb5_data *d));
+	(krb5_data *d);
 void ktest_destroy_principal
-	KRB5_PROTOTYPE((krb5_principal *p));
+	(krb5_principal *p);
 void ktest_destroy_checksum
-	KRB5_PROTOTYPE((krb5_checksum **cs));
+	(krb5_checksum **cs);
 void ktest_destroy_keyblock
-	KRB5_PROTOTYPE((krb5_keyblock **kb));
+	(krb5_keyblock **kb);
 void ktest_destroy_authdata
-	KRB5_PROTOTYPE((krb5_authdata **ad));
+	(krb5_authdata **ad);
 void ktest_destroy_sequence_of_integer
-	KRB5_PROTOTYPE((long **soi));
+	(long **soi);
 void ktest_destroy_sequence_of_ticket
-	KRB5_PROTOTYPE((krb5_ticket ***sot));
+	(krb5_ticket ***sot);
   void ktest_destroy_ticket
-	KRB5_PROTOTYPE((krb5_ticket **tkt));
+	(krb5_ticket **tkt);
 void ktest_destroy_enc_data
-	KRB5_PROTOTYPE((krb5_enc_data *ed));
+	(krb5_enc_data *ed);
 
 void ktest_destroy_etype_info_entry
-	KRB5_PROTOTYPE((krb5_etype_info_entry *i));
+	(krb5_etype_info_entry *i);
 void ktest_destroy_etype_info
-	KRB5_PROTOTYPE((krb5_etype_info_entry **info));
+	(krb5_etype_info_entry **info);
 
 extern krb5_context test_context;
 extern char *sample_principal_name;
diff --git a/src/tests/asn.1/ktest_equal.h b/src/tests/asn.1/ktest_equal.h
index aa150f2316..d45cf51a34 100644
--- a/src/tests/asn.1/ktest_equal.h
+++ b/src/tests/asn.1/ktest_equal.h
@@ -10,12 +10,12 @@
 	    Returns false (zero) if ref and var differ. */
 
 #define generic(funcname,type)\
-int funcname KRB5_PROTOTYPE((type *ref, type *var))
+int funcname (type *ref, type *var)
 
 #define len_array(funcname,type)\
-int funcname KRB5_PROTOTYPE((const int length, type *ref, type *var))
+int funcname (const int length, type *ref, type *var)
 #define len_unsigned_array(funcname,type)\
-int funcname KRB5_PROTOTYPE((const unsigned int length, type *ref, type *var))
+int funcname (const unsigned int length, type *ref, type *var)
 
 generic(ktest_equal_authenticator,krb5_authenticator);
 generic(ktest_equal_principal_data,krb5_principal_data);
@@ -61,33 +61,33 @@ generic(ktest_equal_sam_challenge,krb5_sam_challenge);
 generic(ktest_equal_sam_response,krb5_sam_response);
 
 int ktest_equal_last_req
-	KRB5_PROTOTYPE((krb5_last_req_entry **ref, krb5_last_req_entry **var));
+	(krb5_last_req_entry **ref, krb5_last_req_entry **var);
 int ktest_equal_sequence_of_ticket
-	KRB5_PROTOTYPE((krb5_ticket **ref, krb5_ticket **var));
+	(krb5_ticket **ref, krb5_ticket **var);
 int ktest_equal_sequence_of_pa_data
-	KRB5_PROTOTYPE((krb5_pa_data **ref, krb5_pa_data **var));
+	(krb5_pa_data **ref, krb5_pa_data **var);
 int ktest_equal_sequence_of_cred_info
-	KRB5_PROTOTYPE((krb5_cred_info **ref, krb5_cred_info **var));
+	(krb5_cred_info **ref, krb5_cred_info **var);
 
 len_array(ktest_equal_array_of_enctype,krb5_enctype);
 len_array(ktest_equal_array_of_data,krb5_data);
 len_unsigned_array(ktest_equal_array_of_octet,krb5_octet);
 
 int ktest_equal_array_of_passwd_phrase_element
-	KRB5_PROTOTYPE((passwd_phrase_element **ref, passwd_phrase_element **var));
+	(passwd_phrase_element **ref, passwd_phrase_element **var);
 int ktest_equal_authorization_data
-	KRB5_PROTOTYPE((krb5_authdata **ref, krb5_authdata **var));
+	(krb5_authdata **ref, krb5_authdata **var);
 int ktest_equal_addresses
-	KRB5_PROTOTYPE((krb5_address **ref, krb5_address **var));
+	(krb5_address **ref, krb5_address **var);
 int ktest_equal_array_of_char
-	KRB5_PROTOTYPE((const unsigned int length, char *ref, char *var));
+	(const unsigned int length, char *ref, char *var);
 
 int ktest_equal_etype_info
-    KRB5_PROTOTYPE((krb5_etype_info_entry ** ref,
-		    krb5_etype_info_entry ** var));
+    (krb5_etype_info_entry ** ref,
+		    krb5_etype_info_entry ** var);
 
 int ktest_equal_krb5_etype_info_entry
-    KRB5_PROTOTYPE((krb5_etype_info_entry * ref,
-		    krb5_etype_info_entry * var));
+    (krb5_etype_info_entry * ref,
+		    krb5_etype_info_entry * var);
 
 #endif
diff --git a/src/tests/asn.1/utility.c b/src/tests/asn.1/utility.c
index f2dda9e2d4..07addc4a12 100644
--- a/src/tests/asn.1/utility.c
+++ b/src/tests/asn.1/utility.c
@@ -3,7 +3,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 
-char hexchar PROTOTYPE((const unsigned int digit));
+char hexchar (const unsigned int digit);
 
 asn1_error_code asn1_krb5_data_unparse(code, s)
      const krb5_data * code;
diff --git a/src/tests/asn.1/utility.h b/src/tests/asn.1/utility.h
index 0fda2c00a6..fa79258e54 100644
--- a/src/tests/asn.1/utility.h
+++ b/src/tests/asn.1/utility.h
@@ -6,7 +6,7 @@
 #include "asn1buf.h"
 
 asn1_error_code asn1_krb5_data_unparse
-	PROTOTYPE((const krb5_data *code, char **s));
+	(const krb5_data *code, char **s);
 /* modifies  *s;
    effects   Instantiates *s with a string representation of the series
 	      of hex octets in *code.  (e.g. "02 02 00 7F")  If code==NULL,
@@ -17,16 +17,16 @@ asn1_error_code asn1_krb5_data_unparse
 	     Returns ENOMEM or the string rep cannot be created. */
 
 krb5_error_code krb5_data_parse
-	PROTOTYPE((krb5_data *d, const char *s));
+	(krb5_data *d, const char *s);
 /* effects  Parses character string *s into krb5_data *d. */
 
 krb5_error_code krb5_data_hex_parse
-	PROTOTYPE((krb5_data *d, const char *s));
+	(krb5_data *d, const char *s);
 /* requires  *s is the string representation of a sequence of
               hexadecimal octets.  (e.g. "02 01 00")
    effects  Parses *s into krb5_data *d. */
 
 void asn1buf_print
-	PROTOTYPE((const asn1buf *buf));
+	(const asn1buf *buf);
 
 #endif
diff --git a/src/tests/create/ChangeLog b/src/tests/create/ChangeLog
index b6910afe62..e8817cb60f 100644
--- a/src/tests/create/ChangeLog
+++ b/src/tests/create/ChangeLog
@@ -1,3 +1,7 @@
+2001-10-09  Ken Raeburn  <raeburn@mit.edu>
+
+	* kdb5_mkdums.c: Make prototypes unconditional.
+
 2000-07-28  Ezra Peisach  <epeisach@engrailed.mit.edu>
 
 	* kdb5_mkdums.c: Remove unused quit().
diff --git a/src/tests/create/kdb5_mkdums.c b/src/tests/create/kdb5_mkdums.c
index c20b7cc1cd..50f2c9bf0f 100644
--- a/src/tests/create/kdb5_mkdums.c
+++ b/src/tests/create/kdb5_mkdums.c
@@ -50,7 +50,7 @@ struct mblock {
     1
 };
 
-int set_dbname_help PROTOTYPE((char *, char *));
+int set_dbname_help (char *, char *);
 
 static void
 usage(who, status)
@@ -77,7 +77,7 @@ static char *mkey_name = 0;
 static char *mkey_password = 0;
 static krb5_boolean manual_mkey = FALSE;
 
-void add_princ PROTOTYPE((krb5_context, char *));
+void add_princ (krb5_context, char *);
 
 int
 main(argc, argv)
diff --git a/src/tests/gssapi/ChangeLog b/src/tests/gssapi/ChangeLog
index 178dd73b4f..84872da091 100644
--- a/src/tests/gssapi/ChangeLog
+++ b/src/tests/gssapi/ChangeLog
@@ -1,3 +1,7 @@
+2001-10-09  Ken Raeburn  <raeburn@mit.edu>
+
+	* t_imp_name.c: Make prototypes unconditional.
+
 2001-09-01  Ken Raeburn  <raeburn@mit.edu>
 
 	* Makefile.in (SRCS): Use srcdir.
diff --git a/src/tests/gssapi/t_imp_name.c b/src/tests/gssapi/t_imp_name.c
index 6c90b72f8f..f4ca41370e 100644
--- a/src/tests/gssapi/t_imp_name.c
+++ b/src/tests/gssapi/t_imp_name.c
@@ -34,10 +34,10 @@
 #include <gssapi/gssapi_generic.h>
 
 #define GSSAPI_V2
-void display_status PROTOTYPE((char *, OM_uint32, OM_uint32));
-static void display_status_1 PROTOTYPE((char *, OM_uint32, int));
-static void display_buffer PROTOTYPE((gss_buffer_desc));
-static int test_import_name PROTOTYPE((char *));
+void display_status (char *, OM_uint32, OM_uint32);
+static void display_status_1 (char *, OM_uint32, int);
+static void display_buffer (gss_buffer_desc);
+static int test_import_name (char *);
 
 FILE *display_file;
 
diff --git a/src/tests/hammer/ChangeLog b/src/tests/hammer/ChangeLog
index d5f83cc7fe..86dff00893 100644
--- a/src/tests/hammer/ChangeLog
+++ b/src/tests/hammer/ChangeLog
@@ -1,3 +1,7 @@
+2001-10-09  Ken Raeburn  <raeburn@mit.edu>
+
+	* kdb5_hammer.c: Make prototypes unconditional.
+
 2001-08-29  Ken Raeburn  <raeburn@mit.edu>
 
 	* kdc5_hammer.c (main): Initialize enctype at entry; eliminate
diff --git a/src/tests/hammer/kdc5_hammer.c b/src/tests/hammer/kdc5_hammer.c
index fa14fd912b..4aa750af0a 100644
--- a/src/tests/hammer/kdc5_hammer.c
+++ b/src/tests/hammer/kdc5_hammer.c
@@ -59,19 +59,19 @@ krb5_data tgtname = {
 };
 
 int verify_cs_pair 
-	PROTOTYPE((krb5_context,
+	(krb5_context,
 		   char *,
 		   krb5_principal,
 		   char *,
 		   char *,
 		   int, int, int,
-		   krb5_ccache));
+		   krb5_ccache);
 
 int get_tgt 
-	PROTOTYPE((krb5_context,
+	(krb5_context,
 		   char *,
 		   krb5_principal *,
-		   krb5_ccache));
+		   krb5_ccache);
 
 static void
 usage(who, status)
diff --git a/src/tests/verify/ChangeLog b/src/tests/verify/ChangeLog
index 016ff12866..c12b37dc0d 100644
--- a/src/tests/verify/ChangeLog
+++ b/src/tests/verify/ChangeLog
@@ -1,3 +1,7 @@
+2001-10-09  Ken Raeburn  <raeburn@mit.edu>
+
+	* kdb5_verify.c: Make prototypes unconditional.
+
 2000-07-28  Ezra Peisach  <epeisach@mit.edu>
 
 	* kdb5_verify.c (check_princ): Compiler warning cleanup. Get rid
diff --git a/src/tests/verify/kdb5_verify.c b/src/tests/verify/kdb5_verify.c
index 291accb3af..f15abaa5e6 100644
--- a/src/tests/verify/kdb5_verify.c
+++ b/src/tests/verify/kdb5_verify.c
@@ -49,7 +49,7 @@ struct mblock {
     0
 };
 
-int set_dbname_help PROTOTYPE((krb5_context, char *, char *));
+int set_dbname_help (krb5_context, char *, char *);
 
 static void
 usage(who, status)
@@ -78,7 +78,7 @@ static char *mkey_password = 0;
 static krb5_boolean manual_mkey = FALSE;
 
 
-int check_princ PROTOTYPE((krb5_context, char *));
+int check_princ (krb5_context, char *);
 
 int
 main(argc, argv)