diff options
| author | Ken Raeburn <raeburn@mit.edu> | 2001-10-10 03:18:22 +0000 |
|---|---|---|
| committer | Ken Raeburn <raeburn@mit.edu> | 2001-10-10 03:18:22 +0000 |
| commit | 7613acc70e37ebabd7743da02da4f4ff0d218d5c (patch) | |
| tree | ea7b08ad73cfb7cd8a5ca8e77a9fb646770804f0 /src/lib/krb5 | |
| parent | ad4d9f8d0f83524931da62aebb592ab53f2218d9 (diff) | |
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
Diffstat (limited to 'src/lib/krb5')
49 files changed, 579 insertions, 539 deletions
diff --git a/src/lib/krb5/asn.1/ChangeLog b/src/lib/krb5/asn.1/ChangeLog index 7da653e20..9a70a2dd3 100644 --- a/src/lib/krb5/asn.1/ChangeLog +++ b/src/lib/krb5/asn.1/ChangeLog @@ -1,3 +1,9 @@ +2001-10-09 Ken Raeburn <raeburn@mit.edu> + + * asn1_decode.c, asn1_decode.h, asn1_encode.h, asn1_get.h, + asn1_k_decode.h, asn1_k_encode.h, asn1_make.h, asn1_misc.h, + asn1buf.h: Make prototypes unconditional. + 2001-07-24 Ezra Peisach <epeisach@mit.edu> * asn1_k_encode.c: (asn1_encode_predicted_sam_response): Use diff --git a/src/lib/krb5/asn.1/asn1_decode.c b/src/lib/krb5/asn.1/asn1_decode.c index 74d453091..e46df3219 100644 --- a/src/lib/krb5/asn.1/asn1_decode.c +++ b/src/lib/krb5/asn.1/asn1_decode.c @@ -53,7 +53,7 @@ if(class != UNIVERSAL || construction != PRIMITIVE || tagnum != type)\ #define cleanup()\ return 0 -time_t gmt_mktime PROTOTYPE((struct tm *)); +time_t gmt_mktime (struct tm *); asn1_error_code asn1_decode_integer(buf, val) asn1buf * buf; diff --git a/src/lib/krb5/asn.1/asn1_decode.h b/src/lib/krb5/asn.1/asn1_decode.h index 597d23940..bddad8852 100644 --- a/src/lib/krb5/asn.1/asn1_decode.h +++ b/src/lib/krb5/asn.1/asn1_decode.h @@ -59,30 +59,30 @@ Returns asn1 errors. */ asn1_error_code asn1_decode_integer - PROTOTYPE((asn1buf *buf, long *val)); + (asn1buf *buf, long *val); asn1_error_code asn1_decode_unsigned_integer - PROTOTYPE((asn1buf *buf, unsigned long *val)); + (asn1buf *buf, unsigned long *val); asn1_error_code asn1_decode_null - PROTOTYPE((asn1buf *buf)); + (asn1buf *buf); asn1_error_code asn1_decode_octetstring - PROTOTYPE((asn1buf *buf, unsigned int *retlen, asn1_octet **val)); + (asn1buf *buf, unsigned int *retlen, asn1_octet **val); asn1_error_code asn1_decode_generalstring - PROTOTYPE((asn1buf *buf, unsigned int *retlen, char **val)); + (asn1buf *buf, unsigned int *retlen, char **val); asn1_error_code asn1_decode_charstring - PROTOTYPE((asn1buf *buf, unsigned int *retlen, char **val)); + (asn1buf *buf, unsigned int *retlen, char **val); /* Note: A charstring is a special hack to account for the fact that krb5 structures store some OCTET STRING values in krb5_octet arrays and others in krb5_data structures - PROTOTYPE((which use char arrays). + (which use char arrays). From the ASN.1 point of view, the two string types are the same, only the receptacles differ. */ asn1_error_code asn1_decode_printablestring - PROTOTYPE((asn1buf *buf, int *retlen, char **val)); + (asn1buf *buf, int *retlen, char **val); asn1_error_code asn1_decode_ia5string - PROTOTYPE((asn1buf *buf, int *retlen, char **val)); + (asn1buf *buf, int *retlen, char **val); asn1_error_code asn1_decode_generaltime - PROTOTYPE((asn1buf *buf, time_t *val)); + (asn1buf *buf, time_t *val); #endif diff --git a/src/lib/krb5/asn.1/asn1_encode.h b/src/lib/krb5/asn.1/asn1_encode.h index 06ba6f3fe..e5ae4bbb1 100644 --- a/src/lib/krb5/asn.1/asn1_encode.h +++ b/src/lib/krb5/asn.1/asn1_encode.h @@ -50,7 +50,7 @@ */ asn1_error_code asn1_encode_integer - PROTOTYPE((asn1buf *buf, const long val, unsigned int *retlen)); + (asn1buf *buf, const long val, unsigned int *retlen); /* requires *buf is allocated modifies *buf, *retlen effects Inserts the encoding of val into *buf and returns @@ -59,8 +59,8 @@ asn1_error_code asn1_encode_integer to expand the buffer. */ asn1_error_code asn1_encode_unsigned_integer - PROTOTYPE((asn1buf *buf, const unsigned long val, - unsigned int *retlen)); + (asn1buf *buf, const unsigned long val, + unsigned int *retlen); /* requires *buf is allocated modifies *buf, *retlen effects Inserts the encoding of val into *buf and returns @@ -69,9 +69,9 @@ asn1_error_code asn1_encode_unsigned_integer to expand the buffer. */ asn1_error_code asn1_encode_octetstring - PROTOTYPE((asn1buf *buf, + (asn1buf *buf, const unsigned int len, const asn1_octet *val, - unsigned int *retlen)); + unsigned int *retlen); /* requires *buf is allocated modifies *buf, *retlen effects Inserts the encoding of val into *buf and returns @@ -80,9 +80,9 @@ asn1_error_code asn1_encode_octetstring to expand the buffer. */ asn1_error_code asn1_encode_charstring - PROTOTYPE((asn1buf *buf, + (asn1buf *buf, const unsigned int len, const char *val, - unsigned int *retlen)); + unsigned int *retlen); /* requires *buf is allocated modifies *buf, *retlen effects Inserts the encoding of val into *buf and returns @@ -91,7 +91,7 @@ asn1_error_code asn1_encode_charstring to expand the buffer. */ asn1_error_code asn1_encode_null - PROTOTYPE((asn1buf *buf, int *retlen)); + (asn1buf *buf, int *retlen); /* requires *buf is allocated modifies *buf, *retlen effects Inserts the encoding of NULL into *buf and returns @@ -100,9 +100,9 @@ asn1_error_code asn1_encode_null to expand the buffer. */ asn1_error_code asn1_encode_printablestring - PROTOTYPE((asn1buf *buf, + (asn1buf *buf, const unsigned int len, const char *val, - int *retlen)); + int *retlen); /* requires *buf is allocated modifies *buf, *retlen effects Inserts the encoding of val into *buf and returns @@ -111,9 +111,9 @@ asn1_error_code asn1_encode_printablestring to expand the buffer. */ asn1_error_code asn1_encode_ia5string - PROTOTYPE((asn1buf *buf, + (asn1buf *buf, const unsigned int len, const char *val, - int *retlen)); + int *retlen); /* requires *buf is allocated modifies *buf, *retlen effects Inserts the encoding of val into *buf and returns @@ -122,7 +122,7 @@ asn1_error_code asn1_encode_ia5string to expand the buffer. */ asn1_error_code asn1_encode_generaltime - PROTOTYPE((asn1buf *buf, const time_t val, unsigned int *retlen)); + (asn1buf *buf, const time_t val, unsigned int *retlen); /* requires *buf is allocated modifies *buf, *retlen effects Inserts the encoding of val into *buf and returns @@ -132,9 +132,9 @@ asn1_error_code asn1_encode_generaltime Note: The encoding of GeneralizedTime is YYYYMMDDhhmmZ */ asn1_error_code asn1_encode_generalstring - PROTOTYPE((asn1buf *buf, + (asn1buf *buf, const unsigned int len, const char *val, - unsigned int *retlen)); + unsigned int *retlen); /* requires *buf is allocated, val has a length of len characters modifies *buf, *retlen effects Inserts the encoding of val into *buf and returns diff --git a/src/lib/krb5/asn.1/asn1_get.h b/src/lib/krb5/asn.1/asn1_get.h index 450347011..873abc012 100644 --- a/src/lib/krb5/asn.1/asn1_get.h +++ b/src/lib/krb5/asn.1/asn1_get.h @@ -34,17 +34,17 @@ #include "asn1buf.h" asn1_error_code asn1_get_tag_indef - PROTOTYPE((asn1buf *buf, + (asn1buf *buf, asn1_class *class, asn1_construction *construction, asn1_tagnum *tagnum, - unsigned int *retlen, int *indef)); + unsigned int *retlen, int *indef); asn1_error_code asn1_get_tag - PROTOTYPE((asn1buf *buf, + (asn1buf *buf, asn1_class *class, asn1_construction *construction, asn1_tagnum *tagnum, - unsigned int *retlen)); + unsigned int *retlen); /* requires *buf is allocated effects Decodes the tag in *buf. If class != NULL, returns the class in *class. Similarly, the construction, @@ -55,7 +55,7 @@ asn1_error_code asn1_get_tag Returns ASN1_OVERRUN if *buf is exhausted during the parse. */ asn1_error_code asn1_get_sequence - PROTOTYPE((asn1buf *buf, unsigned int *retlen, int *indef)); + (asn1buf *buf, unsigned int *retlen, int *indef); /* requires *buf is allocated effects Decodes a tag from *buf and returns ASN1_BAD_ID if it doesn't have a sequence ID. If retlen != NULL, the @@ -65,10 +65,10 @@ asn1_error_code asn1_get_sequence /* Private Procedures */ asn1_error_code asn1_get_id - PROTOTYPE((asn1buf *buf, + (asn1buf *buf, asn1_class *class, asn1_construction *construction, - asn1_tagnum *tagnum)); + asn1_tagnum *tagnum); /* requires *buf is allocated effects Decodes the group of identifier octets at *buf's current position. If class != NULL, returns the class @@ -77,7 +77,7 @@ asn1_error_code asn1_get_id Returns ASN1_OVERRUN if *buf is exhausted. */ asn1_error_code asn1_get_length - PROTOTYPE((asn1buf *buf, unsigned int *retlen, int *indef)); + (asn1buf *buf, unsigned int *retlen, int *indef); /* requires *buf is allocated effects Decodes the group of length octets at *buf's current position. If retlen != NULL, the diff --git a/src/lib/krb5/asn.1/asn1_k_decode.h b/src/lib/krb5/asn.1/asn1_k_decode.h index 04861a412..22b2d2b5e 100644 --- a/src/lib/krb5/asn.1/asn1_k_decode.h +++ b/src/lib/krb5/asn.1/asn1_k_decode.h @@ -68,112 +68,112 @@ /* scalars */ asn1_error_code asn1_decode_int - PROTOTYPE((asn1buf *buf, int *val)); + (asn1buf *buf, int *val); asn1_error_code asn1_decode_int32 - PROTOTYPE((asn1buf *buf, krb5_int32 *val)); + (asn1buf *buf, krb5_int32 *val); asn1_error_code asn1_decode_kvno - PROTOTYPE((asn1buf *buf, krb5_kvno *val)); + (asn1buf *buf, krb5_kvno *val); asn1_error_code asn1_decode_enctype - PROTOTYPE((asn1buf *buf, krb5_enctype *val)); + (asn1buf *buf, krb5_enctype *val); asn1_error_code asn1_decode_msgtype - PROTOTYPE((asn1buf *buf, krb5_msgtype *val)); + (asn1buf *buf, krb5_msgtype *val); asn1_error_code asn1_decode_cksumtype - PROTOTYPE((asn1buf *buf, krb5_cksumtype *val)); + (asn1buf *buf, krb5_cksumtype *val); asn1_error_code asn1_decode_octet - PROTOTYPE((asn1buf *buf, krb5_octet *val)); + (asn1buf *buf, krb5_octet *val); asn1_error_code asn1_decode_addrtype - PROTOTYPE((asn1buf *buf, krb5_addrtype *val)); + (asn1buf *buf, krb5_addrtype *val); asn1_error_code asn1_decode_authdatatype - PROTOTYPE((asn1buf *buf, krb5_authdatatype *val)); + (asn1buf *buf, krb5_authdatatype *val); asn1_error_code asn1_decode_ui_2 - PROTOTYPE((asn1buf *buf, krb5_ui_2 *val)); + (asn1buf *buf, krb5_ui_2 *val); asn1_error_code asn1_decode_ui_4 - PROTOTYPE((asn1buf *buf, krb5_ui_4 *val)); + (asn1buf *buf, krb5_ui_4 *val); asn1_error_code asn1_decode_kerberos_time - PROTOTYPE((asn1buf *buf, krb5_timestamp *val)); + (asn1buf *buf, krb5_timestamp *val); asn1_error_code asn1_decode_sam_flags - PROTOTYPE((asn1buf *buf, krb5_flags *val)); + (asn1buf *buf, krb5_flags *val); /* structures */ asn1_error_code asn1_decode_realm - PROTOTYPE((asn1buf *buf, krb5_principal *val)); + (asn1buf *buf, krb5_principal *val); asn1_error_code asn1_decode_principal_name - PROTOTYPE((asn1buf *buf, krb5_principal *val)); + (asn1buf *buf, krb5_principal *val); asn1_error_code asn1_decode_checksum - PROTOTYPE((asn1buf *buf, krb5_checksum *val)); + (asn1buf *buf, krb5_checksum *val); asn1_error_code asn1_decode_encryption_key - PROTOTYPE((asn1buf *buf, krb5_keyblock *val)); + (asn1buf *buf, krb5_keyblock *val); asn1_error_code asn1_decode_encrypted_data - PROTOTYPE((asn1buf *buf, krb5_enc_data *val)); + (asn1buf *buf, krb5_enc_data *val); asn1_error_code asn1_decode_ticket_flags - PROTOTYPE((asn1buf *buf, krb5_flags *val)); + (asn1buf *buf, krb5_flags *val); asn1_error_code asn1_decode_transited_encoding - PROTOTYPE((asn1buf *buf, krb5_transited *val)); + (asn1buf *buf, krb5_transited *val); asn1_error_code asn1_decode_enc_kdc_rep_part - PROTOTYPE((asn1buf *buf, krb5_enc_kdc_rep_part *val)); + (asn1buf *buf, krb5_enc_kdc_rep_part *val); asn1_error_code asn1_decode_krb5_flags - PROTOTYPE((asn1buf *buf, krb5_flags *val)); + (asn1buf *buf, krb5_flags *val); asn1_error_code asn1_decode_ap_options - PROTOTYPE((asn1buf *buf, krb5_flags *val)); + (asn1buf *buf, krb5_flags *val); asn1_error_code asn1_decode_kdc_options - PROTOTYPE((asn1buf *buf, krb5_flags *val)); + (asn1buf *buf, krb5_flags *val); asn1_error_code asn1_decode_ticket - PROTOTYPE((asn1buf *buf, krb5_ticket *val)); + (asn1buf *buf, krb5_ticket *val); asn1_error_code asn1_decode_kdc_req - PROTOTYPE((asn1buf *buf, krb5_kdc_req *val)); + (asn1buf *buf, krb5_kdc_req *val); asn1_error_code asn1_decode_kdc_req_body - PROTOTYPE((asn1buf *buf, krb5_kdc_req *val)); + (asn1buf *buf, krb5_kdc_req *val); asn1_error_code asn1_decode_krb_safe_body - PROTOTYPE((asn1buf *buf, krb5_safe *val)); + (asn1buf *buf, krb5_safe *val); asn1_error_code asn1_decode_host_address - PROTOTYPE((asn1buf *buf, krb5_address *val)); + (asn1buf *buf, krb5_address *val); asn1_error_code asn1_decode_kdc_rep - PROTOTYPE((asn1buf *buf, krb5_kdc_rep *val)); + (asn1buf *buf, krb5_kdc_rep *val); asn1_error_code asn1_decode_last_req_entry - PROTOTYPE((asn1buf *buf, krb5_last_req_entry *val)); + (asn1buf *buf, krb5_last_req_entry *val); asn1_error_code asn1_decode_authdata_elt - PROTOTYPE((asn1buf *buf, krb5_authdata *val)); + (asn1buf *buf, krb5_authdata *val); asn1_error_code asn1_decode_krb_cred_info - PROTOTYPE((asn1buf *buf, krb5_cred_info *val)); + (asn1buf *buf, krb5_cred_info *val); asn1_error_code asn1_decode_pa_data - PROTOTYPE((asn1buf *buf, krb5_pa_data *val)); + (asn1buf *buf, krb5_pa_data *val); asn1_error_code asn1_decode_passwdsequence - PROTOTYPE((asn1buf *buf, passwd_phrase_element *val)); + (asn1buf *buf, passwd_phrase_element *val); asn1_error_code asn1_decode_etype_info_entry - PROTOTYPE((asn1buf *buf, krb5_etype_info_entry *val)); + (asn1buf *buf, krb5_etype_info_entry *val); asn1_error_code asn1_decode_sam_challenge - PROTOTYPE((asn1buf *buf, krb5_sam_challenge *val)); + (asn1buf *buf, krb5_sam_challenge *val); asn1_error_code asn1_decode_enc_sam_key - PROTOTYPE((asn1buf *buf, krb5_sam_key *val)); + (asn1buf *buf, krb5_sam_key *val); asn1_error_code asn1_decode_enc_sam_response_enc - PROTOTYPE((asn1buf *buf, krb5_enc_sam_response_enc *val)); + (asn1buf *buf, krb5_enc_sam_response_enc *val); asn1_error_code asn1_decode_sam_response - PROTOTYPE((asn1buf *buf, krb5_sam_response *val)); + (asn1buf *buf, krb5_sam_response *val); asn1_error_code asn1_decode_predicted_sam_response - PROTOTYPE((asn1buf *buf, krb5_predicted_sam_response *val)); + (asn1buf *buf, krb5_predicted_sam_response *val); /* arrays */ asn1_error_code asn1_decode_authorization_data - PROTOTYPE((asn1buf *buf, krb5_authdata ***val)); + (asn1buf *buf, krb5_authdata ***val); asn1_error_code asn1_decode_host_addresses - PROTOTYPE((asn1buf *buf, krb5_address ***val)); + (asn1buf *buf, krb5_address ***val); asn1_error_code asn1_decode_sequence_of_ticket - PROTOTYPE((asn1buf *buf, krb5_ticket ***val)); + (asn1buf *buf, krb5_ticket ***val); asn1_error_code asn1_decode_sequence_of_krb_cred_info - PROTOTYPE((asn1buf *buf, krb5_cred_info ***val)); + (asn1buf *buf, krb5_cred_info ***val); asn1_error_code asn1_decode_sequence_of_pa_data - PROTOTYPE((asn1buf *buf, krb5_pa_data ***val)); + (asn1buf *buf, krb5_pa_data ***val); asn1_error_code asn1_decode_last_req - PROTOTYPE((asn1buf *buf, krb5_last_req_entry ***val)); + (asn1buf *buf, krb5_last_req_entry ***val); asn1_error_code asn1_decode_sequence_of_enctype - PROTOTYPE((asn1buf *buf, int *num, krb5_enctype **val)); + (asn1buf *buf, int *num, krb5_enctype **val); asn1_error_code asn1_decode_sequence_of_passwdsequence - PROTOTYPE((asn1buf *buf, passwd_phrase_element ***val)); + (asn1buf *buf, passwd_phrase_element ***val); asn1_error_code asn1_decode_etype_info - PROTOTYPE((asn1buf *buf, krb5_etype_info_entry ***val)); + (asn1buf *buf, krb5_etype_info_entry ***val); #endif diff --git a/src/lib/krb5/asn.1/asn1_k_encode.h b/src/lib/krb5/asn.1/asn1_k_encode.h index 6a83ecb9d..6d3633513 100644 --- a/src/lib/krb5/asn.1/asn1_k_encode.h +++ b/src/lib/krb5/asn.1/asn1_k_encode.h @@ -105,147 +105,147 @@ asn1_error_code asn1_encode_asn1_type(asn1buf *buf, Returns ENOMEM if memory runs out. */ -asn1_error_code asn1_encode_ui_4 PROTOTYPE((asn1buf *buf, +asn1_error_code asn1_encode_ui_4 (asn1buf *buf, const krb5_ui_4 val, - unsigned int *retlen)); + unsigned int *retlen); -asn1_error_code asn1_encode_msgtype PROTOTYPE((asn1buf *buf, +asn1_error_code asn1_encode_msgtype (asn1buf *buf, const /*krb5_msgtype*/int val, - unsigned int *retlen)); + unsigned int *retlen); asn1_error_code asn1_encode_realm - PROTOTYPE((asn1buf *buf, const krb5_principal val, unsigned int *retlen)); + (asn1buf *buf, const krb5_principal val, unsigned int *retlen); asn1_error_code asn1_encode_principal_name - PROTOTYPE((asn1buf *buf, const krb5_principal val, unsigned int *retlen)); + (asn1buf *buf, const krb5_principal val, unsigned int *retlen); asn1_error_code asn1_encode_encrypted_data - PROTOTYPE((asn1buf *buf, const krb5_enc_data *val, unsigned int *retlen)); + (asn1buf *buf, const krb5_enc_data *val, unsigned int *retlen); asn1_error_code asn1_encode_krb5_flags - PROTOTYPE((asn1buf *buf, const krb5_flags val, unsigned int *retlen)); + (asn1buf *buf, const krb5_flags val, unsigned int *retlen); asn1_error_code asn1_encode_ap_options - PROTOTYPE((asn1buf *buf, const krb5_flags val, unsigned int *retlen)); + (asn1buf *buf, const krb5_flags val, unsigned int *retlen); asn1_error_code asn1_encode_ticket_flags - PROTOTYPE((asn1buf *buf, const krb5_flags val, unsigned int *retlen)); + (asn1buf *buf, const krb5_flags val, unsigned int *retlen); asn1_error_code asn1_encode_kdc_options - PROTOTYPE((asn1buf *buf, const krb5_flags val, unsigned int *retlen)); + (asn1buf *buf, const krb5_flags val, unsigned int *retlen); asn1_error_code asn1_encode_authorization_data - PROTOTYPE((asn1buf *buf, const krb5_authdata **val, unsigned int *retlen)); + (asn1buf *buf, const krb5_authdata **val, unsigned int *retlen); asn1_error_code asn1_encode_krb5_authdata_elt - PROTOTYPE((asn1buf *buf, const krb5_authdata *val, unsigned int *retlen)); + (asn1buf *buf, const krb5_authdata *val, unsigned int *retlen); asn1_error_code asn1_encode_kdc_rep - PROTOTYPE((int msg_type, asn1buf *buf, const krb5_kdc_rep *val, - unsigned int *retlen)); + (int msg_type, asn1buf *buf, const krb5_kdc_rep *val, + unsigned int *retlen); asn1_error_code asn1_encode_enc_kdc_rep_part - PROTOTYPE((asn1buf *buf, const krb5_enc_kdc_rep_part *val, - unsigned int *retlen)); + (asn1buf *buf, const krb5_enc_kdc_rep_part *val, + unsigned int *retlen); asn1_error_code asn1_encode_ticket - PROTOTYPE((asn1buf *buf, const krb5_ticket *val, unsigned int *retlen)); + (asn1buf *buf, const krb5_ticket *val, unsigned int *retlen); asn1_error_code asn1_encode_encryption_key - PROTOTYPE((asn1buf *buf, const krb5_keyblock *val, unsigned int *retlen)); + (asn1buf *buf, const krb5_keyblock *val, unsigned int *retlen); asn1_error_code asn1_encode_kerberos_time - PROTOTYPE((asn1buf *buf, const krb5_timestamp val, unsigned int *retlen)); + (asn1buf *buf, const krb5_timestamp val, unsigned int *retlen); asn1_error_code asn1_encode_checksum - PROTOTYPE((asn1buf *buf, const krb5_checksum *val, unsigned int *retlen)); + (asn1buf *buf, const krb5_checksum *val, unsigned int *retlen); asn1_error_code asn1_encode_host_address - PROTOTYPE((asn1buf *buf, const krb5_address *val, unsigned int *retlen)); + (asn1buf *buf, const krb5_address *val, unsigned int *retlen); asn1_error_code asn1_encode_host_addresses - PROTOTYPE((asn1buf *buf, const krb5_address **val, unsigned int *retlen)); + (asn1buf *buf, const krb5_address **val, unsigned int *retlen); asn1_error_code asn1_encode_transited_encoding - PROTOTYPE((asn1buf *buf, const krb5_transited *val, unsigned int *retlen)); + (asn1buf *buf, const krb5_transited *val, unsigned int *retlen); asn1_error_code asn1_encode_last_req - PROTOTYPE((asn1buf *buf, const krb5_last_req_entry **val, - unsigned int *retlen)); + (asn1buf *buf, const krb5_last_req_entry **val, + unsigned int *retlen); asn1_error_code asn1_encode_sequence_of_pa_data - PROTOTYPE((asn1buf *buf, const krb5_pa_data **val, unsigned int *retlen)); + (asn1buf *buf, const krb5_pa_data **val, unsigned int *retlen); asn1_error_code asn1_encode_sequence_of_ticket - PROTOTYPE((asn1buf *buf, const krb5_ticket **val, unsigned int *retlen)); + (asn1buf *buf, const krb5_ticket **val, unsigned int *retlen); asn1_error_code asn1_encode_sequence_of_enctype - PROTOTYPE((asn1buf *buf, + (asn1buf *buf, const int len, const krb5_enctype *val, - unsigned int *retlen)); + unsigned int *retlen); asn1_error_code asn1_encode_kdc_req - PROTOTYPE((int msg_type, + (int msg_type, asn1buf *buf, const krb5_kdc_req *val, - unsigned int *retlen)); + unsigned int *retlen); asn1_error_code asn1_encode_kdc_req_body - PROTOTYPE((asn1buf *buf, const krb5_kdc_req *val, unsigned int *retlen)); + (asn1buf *buf, const krb5_kdc_req *val, unsigned int *retlen); asn1_error_code asn1_encode_krb_safe_body - PROTOTYPE((asn1buf *buf, const krb5_safe *val, unsigned int *retlen)); + (asn1buf *buf, const krb5_safe *val, unsigned int *retlen); asn1_error_code asn1_encode_sequence_of_krb_cred_info - PROTOTYPE((asn1buf *buf, const krb5_cred_info **val, unsigned int *retlen)); + (asn1buf *buf, const krb5_cred_info **val, unsigned int *retlen); asn1_error_code asn1_encode_krb_cred_info - PROTOTYPE((asn1buf *buf, const krb5_cred_info *val, unsigned int *retlen)); + (asn1buf *buf, const krb5_cred_info *val, unsigned int *retlen); asn1_error_code asn1_encode_last_req_entry - PROTOTYPE((asn1buf *buf, const krb5_last_req_entry *val, - unsigned int *retlen)); + (asn1buf *buf, const krb5_last_req_entry *val, + unsigned int *retlen); asn1_error_code asn1_encode_pa_data - PROTOTYPE((asn1buf *buf, const krb5_pa_data *val, unsigned int *retlen)); + (asn1buf *buf, const krb5_pa_data *val, unsigned int *retlen); asn1_error_code asn1_encode_alt_method - PROTOTYPE((asn1buf *buf, const krb5_alt_method *val, - unsigned int *retlen)); + (asn1buf *buf, const krb5_alt_method *val, + unsigned int *retlen); asn1_error_code asn1_encode_etype_info_entry - PROTOTYPE((asn1buf *buf, const krb5_etype_info_entry *val, - unsigned int *retlen)); + (asn1buf *buf, const krb5_etype_info_entry *val, + unsigned int *retlen); asn1_error_code asn1_encode_etype_info - PROTOTYPE((asn1buf *buf, const krb5_etype_info_entry **val, - unsigned int *retlen)); + (asn1buf *buf, const krb5_etype_info_entry **val, + unsigned int *retlen); asn1_error_code asn1_encode_passwdsequence - PROTOTYPE((asn1buf *buf, const passwd_phrase_element *val, unsigned int *retlen)); + (asn1buf *buf, const passwd_phrase_element *val, unsigned int *retlen); asn1_error_code asn1_encode_sequence_of_passwdsequence - PROTOTYPE((asn1buf *buf, const passwd_phrase_element **val, - unsigned int *retlen)); + (asn1buf *buf, const passwd_phrase_element **val, + unsigned int *retlen); asn1_error_code asn1_encode_sam_flags - PROTOTYPE((asn1buf * buf, const krb5_flags val, unsigned int *retlen)); + (asn1buf * buf, const krb5_flags val, unsigned int *retlen); asn1_error_code asn1_encode_sam_challenge - PROTOTYPE((asn1buf *buf, const krb5_sam_challenge * val, unsigned int *retlen)); + (asn1buf *buf, const krb5_sam_challenge * val, unsigned int *retlen); asn1_error_code asn1_encode_sam_key - PROTOTYPE((asn1buf *buf, const krb5_sam_key *val, unsigned int *retlen)); + (asn1buf *buf, const krb5_sam_key *val, unsigned int *retlen); asn1_error_code asn1_encode_enc_sam_response_enc - PROTOTYPE((asn1buf *buf, const krb5_enc_sam_response_enc *val, - unsigned int *retlen)); + (asn1buf *buf, const krb5_enc_sam_response_enc *val, + unsigned int *retlen); asn1_error_code asn1_encode_sam_response - PROTOTYPE((asn1buf *buf, const krb5_sam_response *val, unsigned int *retlen)); + (asn1buf *buf, const krb5_sam_response *val, unsigned int *retlen); asn1_error_code asn1_encode_predicted_sam_response - PROTOTYPE((asn1buf *buf, const krb5_predicted_sam_response *val, - unsigned int *retlen)); + (asn1buf *buf, const krb5_predicted_sam_response *val, + unsigned int *retlen); #endif diff --git a/src/lib/krb5/asn.1/asn1_make.h b/src/lib/krb5/asn.1/asn1_make.h index 51562f2d7..3fe2fca7f 100644 --- a/src/lib/krb5/asn.1/asn1_make.h +++ b/src/lib/krb5/asn.1/asn1_make.h @@ -47,11 +47,11 @@ */ asn1_error_code asn1_make_etag - PROTOTYPE((asn1buf *buf, + (asn1buf *buf, const asn1_class class, const asn1_tagnum tagnum, const unsigned int in_len, - unsigned int *retlen)); + unsigned int *retlen); /* requires *buf is allocated, in_len is the length of an ASN.1 encoding which has just been inserted in *buf modifies *buf, *retlen @@ -61,11 +61,11 @@ asn1_error_code asn1_make_etag Returns ENOMEM if memory runs out. */ asn1_error_code asn1_make_tag - PROTOTYPE((asn1buf *buf, const asn1_class class, + (asn1buf *buf, const asn1_class class, const asn1_construction construction, const asn1_tagnum tagnum, const unsigned int in_len, - unsigned int *retlen)); + unsigned int *retlen); /* requires *buf is allocated, in_len is the length of an ASN.1 encoding which has just been inserted in *buf modifies *buf, *retlen @@ -78,7 +78,7 @@ asn1_error_code asn1_make_tag the implementation. */ asn1_error_code asn1_make_sequence - PROTOTYPE((asn1buf *buf, const unsigned int seq_len, unsigned int *len)); + (asn1buf *buf, const unsigned int seq_len, unsigned int *len); /* requires *buf is allocated, seq_len is the length of a series of sequence components which have just been inserted in *buf modifies *buf, *retlen @@ -87,8 +87,8 @@ asn1_error_code asn1_make_sequence Returns ENOMEM if memory runs out. */ asn1_error_code asn1_make_set - PROTOTYPE((asn1buf *buf, const unsigned int set_len, - unsigned int *retlen)); + (asn1buf *buf, const unsigned int set_len, + unsigned int *retlen); /* requires *buf is allocated, seq_len is the length of a series of sequence components which have just been inserted in *buf modifies *buf, *retlen @@ -97,12 +97,11 @@ asn1_error_code asn1_make_set Returns ENOMEM if memory runs out. */ asn1_error_code asn1_make_string - PROTOTYPE((asn1buf *buf, + (asn1buf *buf, const unsigned int len, const char *string, - int *retlen)); + int *retlen); /* requires *buf is allocated, len is the length of *string - effects Inserts the encoding of *string - PROTOTYPE((a series of octets) in *buf. + effects Inserts the encoding of *string (a series of octets) in *buf. Returns the length of this encoding in *retlen. Returns ENOMEM if memory runs out. */ @@ -112,26 +111,24 @@ asn1_error_code asn1_make_string /* "helper" procedure for asn1_make_tag */ asn1_error_code asn1_make_length - PROTOTYPE((asn1buf *buf, const unsigned int in_len, - unsigned int *retlen)); + (asn1buf *buf, const unsigned int in_len, + unsigned int *retlen); /* requires *buf is allocated, in_len is the length of an ASN.1 encoding which has just been inserted in *buf modifies *buf, *retlen - effects inserts length octet - PROTOTYPE((s) for in_len into *buf */ + effects inserts length octet(s) for in_len into *buf */ /* "helper" procedure for asn1_make_tag */ asn1_error_code asn1_make_id - PROTOTYPE((asn1buf *buf, + (asn1buf *buf, const asn1_class class, const asn1_construction construction, const asn1_tagnum tagnum, - unsigned int *retlen)); + unsigned int *retlen); /* requires *buf is allocated, class and tagnum are appropriate for the ASN.1 encoding which has just been inserted in *buf modifies *buf, *retlen - effects Inserts id octet - PROTOTYPE((s) of class class and tag number tagnum + effects Inserts id octet(s) of class class and tag number tagnum into *buf */ #endif diff --git a/src/lib/krb5/asn.1/asn1_misc.h b/src/lib/krb5/asn.1/asn1_misc.h index 14a5b2a13..31b30dac2 100644 --- a/src/lib/krb5/asn.1/asn1_misc.h +++ b/src/lib/krb5/asn.1/asn1_misc.h @@ -31,7 +31,7 @@ #include "krbasn1.h" asn1_error_code asn1_krb5_realm_copy - PROTOTYPE((krb5_principal target, krb5_principal source)); + (krb5_principal target, krb5_principal source); /* requires target, source, and source->realm are allocated effects Copies source->realm into target->realm. Returns ENOMEM if memory is exhausted. */ diff --git a/src/lib/krb5/asn.1/asn1buf.h b/src/lib/krb5/asn.1/asn1buf.h index 9d4d24507..f0f8ad2f7 100644 --- a/src/lib/krb5/asn.1/asn1buf.h +++ b/src/lib/krb5/asn.1/asn1buf.h @@ -13,17 +13,17 @@ typedef struct code_buffer_rep { /**************** Private Procedures ****************/ int asn1buf_size - PROTOTYPE((const asn1buf *buf)); + (const asn1buf *buf); /* requires *buf has been created and not destroyed effects Returns the total size - PROTOTYPE((in octets) of buf's octet buffer. */ + (in octets) of buf's octet buffer. */ #define asn1buf_size(buf) \ (((buf) == NULL || (buf)->base == NULL) \ ? 0 \ : ((buf)->bound - (buf)->base + 1)) int asn1buf_free - PROTOTYPE((const asn1buf *buf)); + (const asn1buf *buf); /* requires *buf is allocated effects Returns the number of unused, allocated octets in *buf. */ #define asn1buf_free(buf) \ @@ -33,7 +33,7 @@ int asn1buf_free asn1_error_code asn1buf_ensure_space - PROTOTYPE((asn1buf *buf, const unsigned int amount)); + (asn1buf *buf, const unsigned int amount); /* requires *buf is allocated modifies *buf effects If buf has less than amount octets of free space, then it is @@ -46,14 +46,14 @@ asn1_error_code asn1buf_ensure_space asn1_error_code asn1buf_expand - PROTOTYPE((asn1buf *buf, unsigned int inc)); + (asn1buf *buf, unsigned int inc); /* requires *buf is allocated modifies *buf effects Expands *buf by allocating space for inc more octets. Returns ENOMEM if memory is exhausted. */ int asn1buf_len - PROTOTYPE((const asn1buf *buf)); + (const asn1buf *buf); /* requires *buf is allocated effects Returns the length of the encoding in *buf. */ #define asn1buf_len(buf) ((buf)->next - (buf)->base) @@ -98,12 +98,12 @@ int asn1buf_len */ asn1_error_code asn1buf_create - PROTOTYPE((asn1buf **buf)); + (asn1buf **buf); /* effects Creates a new encoding buffer pointed to by *buf. Returns ENOMEM if the buffer can't be created. */ asn1_error_code asn1buf_wrap_data - PROTOTYPE((asn1buf *buf, const krb5_data *code)); + (asn1buf *buf, const krb5_data *code); /* requires *buf has already been allocated effects Turns *buf into a "wrapper" for *code. i.e. *buf is set up such that its bottom is the beginning of *code, and its top @@ -111,9 +111,9 @@ asn1_error_code asn1buf_wrap_data Returns ASN1_MISSING_FIELD if code is empty. */ asn1_error_code asn1buf_imbed - PROTOTYPE((asn1buf *subbuf, const asn1buf *buf, + (asn1buf *subbuf, const asn1buf *buf, const unsigned int length, - const int indef)); + const int indef); /* requires *subbuf and *buf are allocated effects *subbuf becomes a sub-buffer of *buf. *subbuf begins at *buf's current position and is length octets long. @@ -122,27 +122,27 @@ asn1_error_code asn1buf_imbed position starts at the beginning of *subbuf. */ asn1_error_code asn1buf_sync - PROTOTYPE((asn1buf *buf, asn1buf *subbuf, const asn1_class class, + (asn1buf *buf, asn1buf *subbuf, const asn1_class class, const asn1_tagnum lasttag, const unsigned int length, const int indef, - const int seqindef)); + const int seqindef); /* requires *subbuf is a sub-buffer of *buf, as created by asn1buf_imbed. lasttag is the last tagnumber read. effects Synchronizes *buf's current position to match that of *subbuf. */ asn1_error_code asn1buf_skiptail - PROTOTYPE((asn1buf *buf, const unsigned int length, - const int indef)); + (asn1buf *buf, const unsigned int length, + const int indef); /* requires *buf is a subbuffer used in a decoding of a constructed indefinite sequence. effects skips trailing fields. */ asn1_error_code asn1buf_destroy - PROTOTYPE((asn1buf **buf)); + (asn1buf **buf); /* effects Deallocates **buf, sets *buf to NULL. */ asn1_error_code asn1buf_insert_octet - PROTOTYPE((asn1buf *buf, const int o)); + (asn1buf *buf, const int o); /* requires *buf is allocated effects Inserts o into the buffer *buf, expanding the buffer if necessary. Returns ENOMEM memory is exhausted. */ @@ -162,7 +162,7 @@ extern __inline__ asn1_error_code asn1buf_insert_octet(buf, o) #endif asn1_error_code asn1buf_insert_octetstring - PROTOTYPE((asn1buf *buf, const unsigned int len, const asn1_octet *s)); + (asn1buf *buf, const unsigned int len, const asn1_octet *s); /* requires *buf is allocated modifies *buf effects Inserts the contents of s (an octet array of length len) @@ -170,7 +170,7 @@ asn1_error_code asn1buf_insert_octetstring Returns ENOMEM if memory is exhausted. */ asn1_error_code asn1buf_insert_charstring - PROTOTYPE((asn1buf *buf, const unsigned int len, const char *s)); + (asn1buf *buf, const unsigned int len, const char *s); /* requires *buf is allocated modifies *buf effects Inserts the contents of s (a character array of length len) @@ -178,7 +178,7 @@ asn1_error_code asn1buf_insert_charstring Returns ENOMEM if memory is exhausted. */ asn1_error_code asn1buf_remove_octet - PROTOTYPE((asn1buf *buf, asn1_octet *o)); + (asn1buf *buf, asn1_octet *o); /* requires *buf is allocated effects Returns *buf's current octet in *o and advances to the next octet. @@ -189,7 +189,7 @@ asn1_error_code asn1buf_remove_octet : ((*(o) = (asn1_octet)(*(((buf)->next)++))),0)) asn1_error_code asn1buf_remove_octetstring - PROTOTYPE((asn1buf *buf, const unsigned int len, asn1_octet **s)); + (asn1buf *buf, const unsigned int len, asn1_octet **s); /* requires *buf is allocated effects Removes the next len octets of *buf and returns them in **s. Returns ASN1_OVERRUN if there are fewer than len unread octets @@ -197,8 +197,8 @@ asn1_error_code asn1buf_remove_octetstring Returns ENOMEM if *s could not be allocated. */ asn1_error_code asn1buf_remove_charstring - PROTOTYPE((asn1buf *buf, const unsigned int len, - char **s)); + (asn1buf *buf, const unsigned int len, + char **s); /* requires *buf is allocated effects Removes the next len octets of *buf and returns them in **s. Returns ASN1_OVERRUN if there are fewer than len unread octets @@ -206,26 +206,26 @@ asn1_error_code asn1buf_remove_charstring Returns ENOMEM if *s could not be allocated. */ asn1_error_code asn1buf_unparse - PROTOTYPE((const asn1buf *buf, char **s)); + (const asn1buf *buf, char **s); /* modifies *s effects Returns a human-readable representation of *buf in *s, where each octet in *buf is represented by a character in *s. */ asn1_error_code asn1buf_hex_unparse - PROTOTYPE((const asn1buf *buf, char **s)); + (const asn1buf *buf, char **s); /* modifies *s effects Returns a human-readable representation of *buf in *s, where each octet in *buf is represented by a 2-digit hexadecimal number in *s. */ asn1_error_code asn12krb5_buf - PROTOTYPE((const asn1buf *buf, krb5_data **code)); + (const asn1buf *buf, krb5_data **code); /* modifies *code effects Instantiates **code with the krb5_data representation of **buf. */ int asn1buf_remains - PROTOTYPE((asn1buf *buf, int indef)); + (asn1buf *buf, int indef); /* requires *buf is a buffer containing an asn.1 structure or array modifies *buf effects Returns the number of unprocessed octets remaining in *buf. */ diff --git a/src/lib/krb5/ccache/ChangeLog b/src/lib/krb5/ccache/ChangeLog index 227af04cb..8c7f508df 100644 --- a/src/lib/krb5/ccache/ChangeLog +++ b/src/lib/krb5/ccache/ChangeLog @@ -1,3 +1,8 @@ +2001-10-09 Ken Raeburn <raeburn@mit.edu> + + * cc_file.c, cc_memory.c, cc_stdio.c, ser_cc.c: Make prototypes + unconditional. + 2001-10-05 Ken Raeburn <raeburn@mit.edu> * cc_file.c, cc_stdio.c: Delete _MSDOS (win16) support. diff --git a/src/lib/krb5/ccache/cc_file.c b/src/lib/krb5/ccache/cc_file.c index 233430702..68e1395e3 100644 --- a/src/lib/krb5/ccache/cc_file.c +++ b/src/lib/krb5/ccache/cc_file.c @@ -93,122 +93,122 @@ fcc_nseq.c and fcc_read don't check return values a lot. #endif krb5_error_code KRB5_CALLCONV krb5_fcc_close - KRB5_PROTOTYPE((krb5_context, krb5_ccache id )); + (krb5_context, krb5_ccache id ); krb5_error_code KRB5_CALLCONV krb5_fcc_destroy - KRB5_PROTOTYPE((krb5_context, krb5_ccache id )); + (krb5_context, krb5_ccache id ); krb5_error_code KRB5_CALLCONV krb5_fcc_end_seq_get - KRB5_PROTOTYPE((krb5_context, krb5_ccache id , krb5_cc_cursor *cursor )); + (krb5_context, krb5_ccache id , krb5_cc_cursor *cursor ); krb5_error_code KRB5_CALLCONV krb5_fcc_generate_new - KRB5_PROTOTYPE((krb5_context, krb5_ccache *id )); + (krb5_context, krb5_ccache *id ); const char * KRB5_CALLCONV krb5_fcc_get_name - KRB5_PROTOTYPE((krb5_context, krb5_ccache id )); + (krb5_context, krb5_ccache id ); krb5_error_code KRB5_CALLCONV krb5_fcc_get_principal - KRB5_PROTOTYPE((krb5_context, krb5_ccache id , krb5_principal *princ )); + (krb5_context, krb5_ccache id , krb5_principal *princ ); krb5_error_code KRB5_CALLCONV krb5_fcc_initialize - KRB5_PROTOTYPE((krb5_context, krb5_ccache id , krb5_principal princ )); + (krb5_context, krb5_ccache id , krb5_principal princ ); krb5_error_code KRB5_CALLCONV krb5_fcc_next_cred - KRB5_PROTOTYPE((krb5_context, + (krb5_context, krb5_ccache id , krb5_cc_cursor *cursor , - krb5_creds *creds )); + krb5_creds *creds ); krb5_error_code krb5_fcc_read - KRB5_PROTOTYPE((krb5_context, + (krb5_context, krb5_ccache id , krb5_pointer buf, - unsigned int len)); + unsigned int len); krb5_error_code krb5_fcc_read_principal - KRB5_PROTOTYPE((krb5_context, krb5_ccache id , krb5_principal *princ )); + (krb5_context, krb5_ccache id , krb5_principal *princ ); krb5_error_code krb5_fcc_read_keyblock - KRB5_PROTOTYPE((krb5_context, krb5_ccache id , krb5_keyblock *keyblock )); + (krb5_context, krb5_ccache id , krb5_keyblock *keyblock ); krb5_error_code krb5_fcc_read_data - KRB5_PROTOTYPE((krb5_context, krb5_ccache id , krb5_data *data )); + (krb5_context, krb5_ccache id , krb5_data *data ); krb5_error_code krb5_fcc_read_int32 - KRB5_PROTOTYPE((krb5_context, krb5_ccache id , krb5_int32 *i )); + (krb5_context, krb5_ccache id , krb5_int32 *i ); krb5_error_code krb5_fcc_read_ui_2 - KRB5_PROTOTYPE((krb5_context, krb5_ccache id , krb5_ui_2 *i )); + (krb5_context, krb5_ccache id , krb5_ui_2 *i ); krb5_error_code krb5_fcc_read_octet - KRB5_PROTOTYPE((krb5_context, krb5_ccache id , krb5_octet *i )); + (krb5_context, krb5_ccache id , krb5_octet *i ); krb5_error_code krb5_fcc_read_times - KRB5_PROTOTYPE((krb5_context, krb5_ccache id , krb5_ticket_times *t )); + (krb5_context, krb5_ccache id , krb5_ticket_times *t ); krb5_error_code krb5_fcc_read_addrs - KRB5_PROTOTYPE((krb5_context, krb5_ccache, krb5_address ***)); + (krb5_context, krb5_ccache, krb5_address ***); krb5_error_code krb5_fcc_read_addr - KRB5_PROTOTYPE((krb5_context, krb5_ccache, krb5_address *)); + (krb5_context, krb5_ccache, krb5_address *); krb5_error_code krb5_fcc_read_authdata - KRB5_PROTOTYPE((krb5_context, krb5_ccache , krb5_authdata ***)); + (krb5_context, krb5_ccache , krb5_authdata ***); krb5_error_code krb5_fcc_read_authdatum - KRB5_PROTOTYPE((krb5_context, krb5_ccache , krb5_authdata *)); + (krb5_context, krb5_ccache , krb5_authdata *); krb5_error_code KRB5_CALLCONV krb5_fcc_resolve - KRB5_PROTOTYPE((krb5_context, krb5_ccache *id , const char *residual )); + (krb5_context, krb5_ccache *id , const char *residual ); krb5_error_code KRB5_CALLCONV krb5_fcc_retrieve - KRB5_PROTOTYPE((krb5_context, + (krb5_context, krb5_ccache id , krb5_flags whichfields , krb5_creds *mcreds , - krb5_creds *creds )); + krb5_creds *creds ); krb5_error_code KRB5_CALLCONV krb5_fcc_start_seq_get - KRB5_PROTOTYPE((krb5_context, krb5_ccache id , krb5_cc_cursor *cursor )); + (krb5_context, krb5_ccache id , krb5_cc_cursor *cursor ); krb5_error_code KRB5_CALLCONV krb5_fcc_store - KRB5_PROTOTYPE((krb5_context, krb5_ccache id , krb5_creds *creds )); + (krb5_context, krb5_ccache id , krb5_creds *creds ); krb5_error_code krb5_fcc_skip_header - KRB5_PROTOTYPE((krb5_context, krb5_ccache)); + (krb5_context, krb5_ccache); krb5_error_code krb5_fcc_skip_principal - KRB5_PROTOTYPE((krb5_context, krb5_ccache id )); + (krb5_context, krb5_ccache id ); krb5_error_code KRB5_CALLCONV krb5_fcc_set_flags - KRB5_PROTOTYPE((krb5_context, krb5_ccache id , krb5_flags flags )); + (krb5_context, krb5_ccache id , krb5_flags flags ); extern krb5_cc_ops krb5_cc_file_ops; krb5_error_code krb5_change_cache - KRB5_PROTOTYPE((void)); + (void); krb5_error_code krb5_fcc_write - KRB5_PROTOTYPE((krb5_context, krb5_ccache id , krb5_pointer buf , unsigned int len )); + (krb5_context, krb5_ccache id , krb5_pointer buf , unsigned int len ); krb5_error_code krb5_fcc_store_principal - KRB5_PROTOTYPE((krb5_context, krb5_ccache id , krb5_principal princ )); + (krb5_context, krb5_ccache id , krb5_principal princ ); krb5_error_code krb5_fcc_store_keyblock - KRB5_PROTOTYPE((krb5_context, krb5_ccache id , krb5_keyblock *keyblock )); + (krb5_context, krb5_ccache id , krb5_keyblock *keyblock ); krb5_error_code krb5_fcc_store_data - KRB5_PROTOTYPE((krb5_context, krb5_ccache id , krb5_data *data )); + (krb5_context, krb5_ccache id , krb5_data *data ); krb5_error_code krb5_fcc_store_int32 - KRB5_PROTOTYPE((krb5_context, krb5_ccache id , krb5_int32 i )); + (krb5_context, krb5_ccache id , krb5_int32 i ); krb5_error_code krb5_fcc_store_ui_4 - KRB5_PROTOTYPE((krb5_context, krb5_ccache id , krb5_ui_4 i )); + (krb5_context, krb5_ccache id , krb5_ui_4 i ); krb5_error_code krb5_fcc_store_ui_2 - KRB5_PROTOTYPE((krb5_context, krb5_ccache id , krb5_int32 i )); + (krb5_context, krb5_ccache id , krb5_int32 i ); krb5_error_code krb5_fcc_store_octet - KRB5_PROTOTYPE((krb5_context, krb5_ccache id , krb5_int32 i )); + (krb5_context, krb5_ccache id , krb5_int32 i ); krb5_error_code krb5_fcc_store_times - KRB5_PROTOTYPE((krb5_context, krb5_ccache id , krb5_ticket_times *t )); + (krb5_context, krb5_ccache id , krb5_ticket_times *t ); krb5_error_code krb5_fcc_store_addrs - KRB5_PROTOTYPE((krb5_context, krb5_ccache , krb5_address ** )); + (krb5_context, krb5_ccache , krb5_address ** ); krb5_error_code krb5_fcc_store_addr - KRB5_PROTOTYPE((krb5_context, krb5_ccache , krb5_address * )); + (krb5_context, krb5_ccache , krb5_address * ); krb5_error_code krb5_fcc_store_authdata - KRB5_PROTOTYPE((krb5_context, krb5_ccache , krb5_authdata **)); + (krb5_context, krb5_ccache , krb5_authdata **); krb5_error_code krb5_fcc_store_authdatum - KRB5_PROTOTYPE((krb5_context, krb5_ccache , krb5_authdata *)); + (krb5_context, krb5_ccache , krb5_authdata *); krb5_error_code krb5_fcc_interpret - KRB5_PROTOTYPE((krb5_context, int )); + (krb5_context, int ); krb5_error_code krb5_fcc_close_file - KRB5_PROTOTYPE((krb5_context, krb5_ccache)); + (krb5_context, krb5_ccache); krb5_error_code krb5_fcc_open_file - KRB5_PROTOTYPE((krb5_context, krb5_ccache, int)); + (krb5_context, krb5_ccache, int); #define KRB5_OK 0 diff --git a/src/lib/krb5/ccache/cc_memory.c b/src/lib/krb5/ccache/cc_memory.c index 9979a3b42..76748cd9f 100644 --- a/src/lib/krb5/ccache/cc_memory.c +++ b/src/lib/krb5/ccache/cc_memory.c @@ -35,53 +35,53 @@ #include <errno.h> krb5_error_code KRB5_CALLCONV krb5_mcc_close - PROTOTYPE((krb5_context, krb5_ccache id )); + (krb5_context, krb5_ccache id ); krb5_error_code KRB5_CALLCONV krb5_mcc_destroy - PROTOTYPE((krb5_context, krb5_ccache id )); + (krb5_context, krb5_ccache id ); krb5_error_code KRB5_CALLCONV krb5_mcc_end_seq_get - PROTOTYPE((krb5_context, krb5_ccache id , krb5_cc_cursor *cursor )); + (krb5_context, krb5_ccache id , krb5_cc_cursor *cursor ); krb5_error_code KRB5_CALLCONV krb5_mcc_generate_new - PROTOTYPE((krb5_context, krb5_ccache *id )); + (krb5_context, krb5_ccache *id ); const char * KRB5_CALLCONV krb5_mcc_get_name - PROTOTYPE((krb5_context, krb5_ccache id )); + (krb5_context, krb5_ccache id ); krb5_error_code KRB5_CALLCONV krb5_mcc_get_principal - PROTOTYPE((krb5_context, krb5_ccache id , krb5_principal *princ )); + (krb5_context, krb5_ccache id , krb5_principal *princ ); krb5_error_code KRB5_CALLCONV krb5_mcc_initialize - PROTOTYPE((krb5_context, krb5_ccache id , krb5_principal princ )); + (krb5_context, krb5_ccache id , krb5_principal princ ); krb5_error_code KRB5_CALLCONV krb5_mcc_next_cred - PROTOTYPE((krb5_context, + (krb5_context, krb5_ccache id , krb5_cc_cursor *cursor , - krb5_creds *creds )); + krb5_creds *creds ); krb5_error_code KRB5_CALLCONV krb5_mcc_resolve - PROTOTYPE((krb5_context, krb5_ccache *id , const char *residual )); + (krb5_context, krb5_ccache *id , const char *residual ); krb5_error_code KRB5_CALLCONV krb5_mcc_retrieve - PROTOTYPE((krb5_context, + (krb5_context, krb5_ccache id , krb5_flags whichfields , krb5_creds *mcreds , - krb5_creds *creds )); + krb5_creds *creds ); krb5_error_code KRB5_CALLCONV krb5_mcc_start_seq_get - PROTOTYPE((krb5_context, krb5_ccache id , krb5_cc_cursor *cursor )); + (krb5_context, krb5_ccache id , krb5_cc_cursor *cursor ); krb5_error_code KRB5_CALLCONV krb5_mcc_store - PROTOTYPE((krb5_context, krb5_ccache id , krb5_creds *creds )); + (krb5_context, krb5_ccache id , krb5_creds *creds ); krb5_error_code KRB5_CALLCONV krb5_mcc_set_flags - PROTOTYPE((krb5_context, krb5_ccache id , krb5_flags flags )); + (krb5_context, krb5_ccache id , krb5_flags flags ); extern krb5_cc_ops krb5_mcc_ops; -krb5_error_code krb5_change_cache PROTOTYPE(()); +krb5_error_code krb5_change_cache (); #define KRB5_OK 0 @@ -111,7 +111,7 @@ static krb5_mcc_data *mcc_head = 0; * system errors * permission errors */ -void krb5_mcc_free KRB5_PROTOTYPE((krb5_context context, krb5_ccache id)); +void krb5_mcc_free (krb5_context context, krb5_ccache id); krb5_error_code KRB5_CALLCONV krb5_mcc_initialize(context, id, princ) diff --git a/src/lib/krb5/ccache/cc_stdio.c b/src/lib/krb5/ccache/cc_stdio.c index 4b8291946..9a2a9917f 100644 --- a/src/lib/krb5/ccache/cc_stdio.c +++ b/src/lib/krb5/ccache/cc_stdio.c @@ -83,192 +83,192 @@ end-of-file versus other errors. #include "k5-int.h" krb5_error_code KRB5_CALLCONV krb5_scc_close - PROTOTYPE((krb5_context, - krb5_ccache id )); + (krb5_context, + krb5_ccache id ); krb5_error_code KRB5_CALLCONV krb5_scc_destroy - PROTOTYPE((krb5_context, - krb5_ccache id )); + (krb5_context, + krb5_ccache id ); krb5_error_code KRB5_CALLCONV krb5_scc_end_seq_get - PROTOTYPE((krb5_context, + (krb5_context, krb5_ccache id , - krb5_cc_cursor *cursor )); + krb5_cc_cursor *cursor ); krb5_error_code KRB5_CALLCONV krb5_scc_generate_new - PROTOTYPE((krb5_context, - krb5_ccache *id )); + (krb5_context, + krb5_ccache *id ); const char * KRB5_CALLCONV krb5_scc_get_name - PROTOTYPE((krb5_context, - krb5_ccache id )); + (krb5_context, + krb5_ccache id ); krb5_error_code KRB5_CALLCONV krb5_scc_get_principal - PROTOTYPE((krb5_context, + (krb5_context, krb5_ccache id , - krb5_principal *princ )); + krb5_principal *princ ); krb5_error_code KRB5_CALLCONV krb5_scc_initialize - PROTOTYPE((krb5_context, + (krb5_context, krb5_ccache id , - krb5_principal princ )); + krb5_principal princ ); krb5_error_code krb5_scc_close_file - PROTOTYPE((krb5_context, - krb5_ccache)); + (krb5_context, + krb5_ccache); krb5_error_code krb5_scc_open_file - PROTOTYPE((krb5_context, + (krb5_context, krb5_ccache, - int)); + int); krb5_error_code KRB5_CALLCONV krb5_scc_next_cred - PROTOTYPE((krb5_context, + (krb5_context, krb5_ccache id , krb5_cc_cursor *cursor , - krb5_creds *creds )); + krb5_creds *creds ); krb5_error_code krb5_scc_read - PROTOTYPE((krb5_context, + (krb5_context, krb5_ccache id , krb5_pointer buf, - unsigned int len)); + unsigned int len); krb5_error_code krb5_scc_read_principal - PROTOTYPE((krb5_context, + (krb5_context, krb5_ccache id , - krb5_principal *princ )); + krb5_principal *princ ); krb5_error_code krb5_scc_read_keyblock - PROTOTYPE((krb5_context, + (krb5_context, krb5_ccache id , - krb5_keyblock *keyblock )); + krb5_keyblock *keyblock ); krb5_error_code krb5_scc_read_data - PROTOTYPE((krb5_context, + (krb5_context, krb5_ccache id , - krb5_data *data )); + krb5_data *data ); krb5_error_code krb5_scc_read_int32 - PROTOTYPE((krb5_context, + (krb5_context, krb5_ccache id , - krb5_int32 *i )); + krb5_int32 *i ); krb5_error_code krb5_scc_read_ui_2 - PROTOTYPE((krb5_context, + (krb5_context, krb5_ccache id , - krb5_ui_2 *i )); + krb5_ui_2 *i ); krb5_error_code krb5_scc_read_octet - PROTOTYPE((krb5_context, + (krb5_context, krb5_ccache id , - krb5_octet *i )); + krb5_octet *i ); krb5_error_code krb5_scc_read_times - PROTOTYPE((krb5_context, + (krb5_context, krb5_ccache id , - krb5_ticket_times *t )); + krb5_ticket_times *t ); krb5_error_code krb5_scc_read_addrs - PROTOTYPE((krb5_context, + (krb5_context, krb5_ccache, - krb5_address ***)); + krb5_address ***); krb5_error_code krb5_scc_read_addr - PROTOTYPE((krb5_context, + (krb5_context, krb5_ccache, - krb5_address *)); + krb5_address *); krb5_error_code krb5_scc_read_authdata - PROTOTYPE((krb5_context, + (krb5_context, krb5_ccache, - krb5_authdata***)); + krb5_authdata***); krb5_error_code krb5_scc_read_authdatum - PROTOTYPE((krb5_context, + (krb5_context, krb5_ccache, - krb5_authdata*)); + krb5_authdata*); krb5_error_code KRB5_CALLCONV krb5_scc_resolve - PROTOTYPE((krb5_context, + (krb5_context, krb5_ccache *id , - const char *residual )); + const char *residual ); krb5_error_code KRB5_CALLCONV krb5_scc_retrieve - PROTOTYPE((krb5_context, + (krb5_context, krb5_ccache id , krb5_flags whichfields , krb5_creds *mcreds , - krb5_creds *creds )); + krb5_creds *creds ); krb5_error_code KRB5_CALLCONV krb5_scc_start_seq_get - PROTOTYPE((krb5_context, + (krb5_context, krb5_ccache id , - krb5_cc_cursor *cursor )); + krb5_cc_cursor *cursor ); krb5_error_code KRB5_CALLCONV krb5_scc_store - PROTOTYPE((krb5_context, + (krb5_context, krb5_ccache id , - krb5_creds *creds )); + krb5_creds *creds ); krb5_error_code krb5_scc_skip_header - PROTOTYPE((krb5_context, krb5_ccache)); + (krb5_context, krb5_ccache); krb5_error_code krb5_scc_skip_principal - PROTOTYPE((krb5_context, - krb5_ccache id )); + (krb5_context, + krb5_ccache id ); krb5_error_code KRB5_CALLCONV krb5_scc_set_flags - PROTOTYPE((krb5_context, + (krb5_context, krb5_ccache id , - krb5_flags flags )); + krb5_flags flags ); extern krb5_cc_ops krb5_scc_ops; krb5_error_code krb5_scc_write - PROTOTYPE((krb5_context, + (krb5_context, krb5_ccache id , krb5_pointer buf , - unsigned int len )); + unsigned int len ); krb5_error_code krb5_scc_store_principal - PROTOTYPE((krb5_context, + (krb5_context, krb5_ccache id , - krb5_principal princ )); + krb5_principal princ ); krb5_error_code krb5_scc_store_keyblock - PROTOTYPE((krb5_context, + (krb5_context, krb5_ccache id , - krb5_keyblock *keyblock )); + krb5_keyblock *keyblock ); krb5_error_code krb5_scc_store_data - PROTOTYPE((krb5_context, + (krb5_context, krb5_ccache id , - krb5_data *data )); + krb5_data *data ); krb5_error_code krb5_scc_store_int32 - PROTOTYPE((krb5_context, + (krb5_context, krb5_ccache id , - krb5_int32 i )); + krb5_int32 i ); krb5_error_code krb5_scc_store_ui_4 - PROTOTYPE((krb5_context, + (krb5_context, krb5_ccache id , - krb5_ui_4 i )); + krb5_ui_4 i ); krb5_error_code krb5_scc_store_ui_2 - PROTOTYPE((krb5_context, + (krb5_context, krb5_ccache id , - krb5_int32 i )); + krb5_int32 i ); krb5_error_code krb5_scc_store_octet - PROTOTYPE((krb5_context, + (krb5_context, krb5_ccache id , - krb5_int32 i )); + krb5_int32 i ); krb5_error_code krb5_scc_store_times - PROTOTYPE((krb5_context, + (krb5_context, krb5_ccache id , - krb5_ticket_times *t )); + krb5_ticket_times *t ); krb5_error_code krb5_scc_store_addrs - PROTOTYPE((krb5_context, + (krb5_context, krb5_ccache , - krb5_address ** )); + krb5_address ** ); krb5_error_code krb5_scc_store_addr - PROTOTYPE((krb5_context, + (krb5_context, krb5_ccache , - krb5_address * )); + krb5_address * ); krb5_error_code krb5_scc_store_authdata - PROTOTYPE((krb5_context, + (krb5_context, krb5_ccache, - krb5_authdata **)); + krb5_authdata **); krb5_error_code krb5_scc_store_authdatum - PROTOTYPE((krb5_context, + (krb5_context, krb5_ccache, - krb5_authdata *)); + krb5_authdata *); krb5_error_code krb5_scc_interpret - PROTOTYPE((krb5_context, - int )); + (krb5_context, + int ); #include <stdio.h> diff --git a/src/lib/krb5/ccache/ccapi/ChangeLog b/src/lib/krb5/ccache/ccapi/ChangeLog index 973583a7f..732b8ebd7 100644 --- a/src/lib/krb5/ccache/ccapi/ChangeLog +++ b/src/lib/krb5/ccache/ccapi/ChangeLog @@ -1,3 +1,7 @@ +2001-10-09 Ken Raeburn <raeburn@mit.edu> + + * stdcc.h: Make prototypes unconditional. + 2001-10-05 Ken Raeburn <raeburn@mit.edu> * stdcc.c, stdcc.h, stdcc_util.c, stdcc_util.h, winccld.c: Delete diff --git a/src/lib/krb5/ccache/ccapi/stdcc.h b/src/lib/krb5/ccache/ccapi/stdcc.h index e2d113168..705cdf5f2 100644 --- a/src/lib/krb5/ccache/ccapi/stdcc.h +++ b/src/lib/krb5/ccache/ccapi/stdcc.h @@ -26,50 +26,50 @@ typedef struct _stdccCacheData { /* function protoypes */ krb5_error_code KRB5_CALLCONV krb5_stdcc_close - KRB5_PROTOTYPE((krb5_context, krb5_ccache id )); + (krb5_context, krb5_ccache id ); krb5_error_code KRB5_CALLCONV krb5_stdcc_destroy - KRB5_PROTOTYPE((krb5_context, krb5_ccache id )); + (krb5_context, krb5_ccache id ); krb5_error_code KRB5_CALLCONV krb5_stdcc_end_seq_get - KRB5_PROTOTYPE((krb5_context, krb5_ccache id , krb5_cc_cursor *cursor )); + (krb5_context, krb5_ccache id , krb5_cc_cursor *cursor ); krb5_error_code KRB5_CALLCONV krb5_stdcc_generate_new - KRB5_PROTOTYPE((krb5_context, krb5_ccache *id )); + (krb5_context, krb5_ccache *id ); const char * KRB5_CALLCONV krb5_stdcc_get_name - KRB5_PROTOTYPE((krb5_context, krb5_ccache id )); + (krb5_context, krb5_ccache id ); krb5_error_code KRB5_CALLCONV krb5_stdcc_get_principal - KRB5_PROTOTYPE((krb5_context, krb5_ccache id , krb5_principal *princ )); + (krb5_context, krb5_ccache id , krb5_principal *princ ); krb5_error_code KRB5_CALLCONV krb5_stdcc_initialize - KRB5_PROTOTYPE((krb5_context, krb5_ccache id , krb5_principal princ )); + (krb5_context, krb5_ccache id , krb5_principal princ ); krb5_error_code KRB5_CALLCONV krb5_stdcc_next_cred - KRB5_PROTOTYPE((krb5_context, + (krb5_context, krb5_ccache id , krb5_cc_cursor *cursor , - krb5_creds *creds )); + krb5_creds *creds ); krb5_error_code KRB5_CALLCONV krb5_stdcc_resolve - KRB5_PROTOTYPE((krb5_context, krb5_ccache *id , const char *residual )); + (krb5_context, krb5_ccache *id , const char *residual ); krb5_error_code KRB5_CALLCONV krb5_stdcc_retrieve - KRB5_PROTOTYPE((krb5_context, + (krb5_context, krb5_ccache id , krb5_flags whichfields , krb5_creds *mcreds , - krb5_creds *creds )); + krb5_creds *creds ); krb5_error_code KRB5_CALLCONV krb5_stdcc_start_seq_get - KRB5_PROTOTYPE((krb5_context, krb5_ccache id , krb5_cc_cursor *cursor )); + (krb5_context, krb5_ccache id , krb5_cc_cursor *cursor ); krb5_error_code KRB5_CALLCONV krb5_stdcc_store - KRB5_PROTOTYPE((krb5_context, krb5_ccache id , krb5_creds *creds )); + (krb5_context, krb5_ccache id , krb5_creds *creds ); krb5_error_code KRB5_CALLCONV krb5_stdcc_set_flags - KRB5_PROTOTYPE((krb5_context, krb5_ccache id , krb5_flags flags )); + (krb5_context, krb5_ccache id , krb5_flags flags ); krb5_error_code KRB5_CALLCONV krb5_stdcc_remove - KRB5_PROTOTYPE((krb5_context, krb5_ccache id , krb5_flags flags, krb5_creds *creds)); + (krb5_context, krb5_ccache id , krb5_flags flags, krb5_creds *creds); diff --git a/src/lib/krb5/ccache/ser_cc.c b/src/lib/krb5/ccache/ser_cc.c index 038099256..23eefe42a 100644 --- a/src/lib/krb5/ccache/ser_cc.c +++ b/src/lib/krb5/ccache/ser_cc.c @@ -37,11 +37,11 @@ * krb5_ccache_internalize(); */ static krb5_error_code krb5_ccache_size - KRB5_PROTOTYPE((krb5_context, krb5_pointer, size_t *)); + (krb5_context, krb5_pointer, size_t *); static krb5_error_code krb5_ccache_externalize - KRB5_PROTOTYPE((krb5_context, krb5_pointer, krb5_octet **, size_t *)); + (krb5_context, krb5_pointer, krb5_octet **, size_t *); static krb5_error_code krb5_ccache_internalize - KRB5_PROTOTYPE((krb5_context,krb5_pointer *, krb5_octet **, size_t *)); + (krb5_context,krb5_pointer *, krb5_octet **, size_t *); /* * Serialization entry for this type. diff --git a/src/lib/krb5/keytab/ChangeLog b/src/lib/krb5/keytab/ChangeLog index ad3cbb7de..95679384c 100644 --- a/src/lib/krb5/keytab/ChangeLog +++ b/src/lib/krb5/keytab/ChangeLog @@ -1,3 +1,7 @@ +2001-10-09 Ken Raeburn <raeburn@mit.edu> + + * ktbase.c: Make prototypes unconditional. + 2001-10-03 Ken Raeburn <raeburn@mit.edu> * ktadd.c, ktbase.c, ktdefault.c, ktfr_entry.c, ktremove.c, diff --git a/src/lib/krb5/keytab/file/ChangeLog b/src/lib/krb5/keytab/file/ChangeLog index e23c9b11d..199cf0c02 100644 --- a/src/lib/krb5/keytab/file/ChangeLog +++ b/src/lib/krb5/keytab/file/ChangeLog @@ -1,3 +1,7 @@ +2001-10-09 Ken Raeburn <raeburn@mit.edu> + + * ktfile.h, ser_ktf.c: Make prototypes unconditional. + 2001-10-05 Ken Raeburn <raeburn@mit.edu> * ser_ktf.c: Drop _MSDOS support. diff --git a/src/lib/krb5/keytab/file/ktfile.h b/src/lib/krb5/keytab/file/ktfile.h index 6481bc29d..2f17b9fdf 100644 --- a/src/lib/krb5/keytab/file/ktfile.h +++ b/src/lib/krb5/keytab/file/ktfile.h @@ -66,103 +66,103 @@ extern struct _krb5_kt_ops krb5_ktf_ops; extern struct _krb5_kt_ops krb5_ktf_writable_ops; krb5_error_code KRB5_CALLCONV krb5_ktfile_resolve - PROTOTYPE((krb5_context, + (krb5_context, const char *, - krb5_keytab *)); + krb5_keytab *); krb5_error_code KRB5_CALLCONV krb5_ktfile_wresolve - PROTOTYPE((krb5_context, + (krb5_context, const char *, - krb5_keytab *)); + krb5_keytab *); krb5_error_code KRB5_CALLCONV krb5_ktfile_get_name - PROTOTYPE((krb5_context, + (krb5_context, krb5_keytab, char *, - unsigned int)); + unsigned int); krb5_error_code KRB5_CALLCONV krb5_ktfile_close - PROTOTYPE((krb5_context, - krb5_keytab)); + (krb5_context, + krb5_keytab); krb5_error_code KRB5_CALLCONV krb5_ktfile_get_entry - PROTOTYPE((krb5_context, + (krb5_context, krb5_keytab, krb5_const_principal, krb5_kvno, krb5_enctype, - krb5_keytab_entry *)); + krb5_keytab_entry *); krb5_error_code KRB5_CALLCONV krb5_ktfile_start_seq_get - PROTOTYPE((krb5_context, + (krb5_context, krb5_keytab, - krb5_kt_cursor *)); + krb5_kt_cursor *); krb5_error_code KRB5_CALLCONV krb5_ktfile_get_next - PROTOTYPE((krb5_context, + (krb5_context, krb5_keytab, krb5_keytab_entry *, - krb5_kt_cursor *)); + krb5_kt_cursor *); krb5_error_code KRB5_CALLCONV krb5_ktfile_end_get - PROTOTYPE((krb5_context, + (krb5_context, krb5_keytab, - krb5_kt_cursor *)); + krb5_kt_cursor *); /* routines to be included on extended version (write routines) */ krb5_error_code KRB5_CALLCONV krb5_ktfile_add - PROTOTYPE((krb5_context, + (krb5_context, krb5_keytab, - krb5_keytab_entry *)); + krb5_keytab_entry *); krb5_error_code KRB5_CALLCONV krb5_ktfile_remove - PROTOTYPE((krb5_context, + (krb5_context, krb5_keytab, - krb5_keytab_entry *)); + krb5_keytab_entry *); krb5_error_code krb5_ktfileint_openr - PROTOTYPE((krb5_context, - krb5_keytab)); + (krb5_context, + krb5_keytab); krb5_error_code krb5_ktfileint_openw - PROTOTYPE((krb5_context, - krb5_keytab)); + (krb5_context, + krb5_keytab); krb5_error_code krb5_ktfileint_close - PROTOTYPE((krb5_context, - krb5_keytab)); + (krb5_context, + krb5_keytab); krb5_error_code krb5_ktfileint_read_entry - PROTOTYPE((krb5_context, + (krb5_context, krb5_keytab, - krb5_keytab_entry *)); + krb5_keytab_entry *); krb5_error_code krb5_ktfileint_write_entry - PROTOTYPE((krb5_context, + (krb5_context, krb5_keytab, - krb5_keytab_entry *)); + krb5_keytab_entry *); krb5_error_code krb5_ktfileint_delete_entry - PROTOTYPE((krb5_context, + (krb5_context, krb5_keytab, - krb5_int32)); + krb5_int32); krb5_error_code krb5_ktfileint_internal_read_entry - PROTOTYPE((krb5_context, + (krb5_context, krb5_keytab, krb5_keytab_entry *, - krb5_int32 *)); + krb5_int32 *); krb5_error_code krb5_ktfileint_size_entry - PROTOTYPE((krb5_context, + (krb5_context, krb5_keytab_entry *, - krb5_int32 *)); + krb5_int32 *); krb5_error_code krb5_ktfileint_find_slot - PROTOTYPE((krb5_context, + (krb5_context, krb5_keytab, krb5_int32 *, - krb5_int32 *)); + krb5_int32 *); #endif /* KRB5_KTFILE__ */ diff --git a/src/lib/krb5/keytab/file/ser_ktf.c b/src/lib/krb5/keytab/file/ser_ktf.c index ca54f93b6..4655e8c8a 100644 --- a/src/lib/krb5/keytab/file/ser_ktf.c +++ b/src/lib/krb5/keytab/file/ser_ktf.c @@ -40,11 +40,11 @@ static const char ktfile_def_name[] = "."; * krb5_ktf_keytab_internalize(); */ static krb5_error_code krb5_ktf_keytab_size - KRB5_PROTOTYPE((krb5_context, krb5_pointer, size_t *)); + (krb5_context, krb5_pointer, size_t *); static krb5_error_code krb5_ktf_keytab_externalize - KRB5_PROTOTYPE((krb5_context, krb5_pointer, krb5_octet **, size_t *)); + (krb5_context, krb5_pointer, krb5_octet **, size_t *); static krb5_error_code krb5_ktf_keytab_internalize - KRB5_PROTOTYPE((krb5_context,krb5_pointer *, krb5_octet **, size_t *)); + (krb5_context,krb5_pointer *, krb5_octet **, size_t *); /* * Serialization entry for this type. diff --git a/src/lib/krb5/keytab/ktbase.c b/src/lib/krb5/keytab/ktbase.c index b808ec42b..5f03e6114 100644 --- a/src/lib/krb5/keytab/ktbase.c +++ b/src/lib/krb5/keytab/ktbase.c @@ -126,11 +126,11 @@ krb5_kt_resolve (context, name, ktid) * krb5_keytab_internalize(); */ static krb5_error_code krb5_keytab_size - KRB5_PROTOTYPE((krb5_context, krb5_pointer, size_t *)); + (krb5_context, krb5_pointer, size_t *); static krb5_error_code krb5_keytab_externalize - KRB5_PROTOTYPE((krb5_context, krb5_pointer, krb5_octet **, size_t *)); + (krb5_context, krb5_pointer, krb5_octet **, size_t *); static krb5_error_code krb5_keytab_internalize - KRB5_PROTOTYPE((krb5_context,krb5_pointer *, krb5_octet **, size_t *)); + (krb5_context,krb5_pointer *, krb5_octet **, size_t *); /* * Serialization entry for this type. diff --git a/src/lib/krb5/keytab/srvtab/ChangeLog b/src/lib/krb5/keytab/srvtab/ChangeLog index 8c435868a..aab09dc7c 100644 --- a/src/lib/krb5/keytab/srvtab/ChangeLog +++ b/src/lib/krb5/keytab/srvtab/ChangeLog @@ -1,3 +1,7 @@ +2001-10-09 Ken Raeburn <raeburn@mit.edu> + + * ktsrvtab.h: Make prototypes unconditional. + 2000-10-17 Ezra Peisach <epeisach@mit.edu> * kts_g_name.c, ktsrvtab.h (krb5_ktsrvtab_get_name): Uses unsigned diff --git a/src/lib/krb5/keytab/srvtab/ktsrvtab.h b/src/lib/krb5/keytab/srvtab/ktsrvtab.h index c7e069505..9f6764d06 100644 --- a/src/lib/krb5/keytab/srvtab/ktsrvtab.h +++ b/src/lib/krb5/keytab/srvtab/ktsrvtab.h @@ -63,55 +63,55 @@ typedef struct _krb5_ktsrvtab_data { extern struct _krb5_kt_ops krb5_kts_ops; krb5_error_code KRB5_CALLCONV krb5_ktsrvtab_resolve - PROTOTYPE((krb5_context, + (krb5_context, const char *, - krb5_keytab *)); + krb5_keytab *); krb5_error_code KRB5_CALLCONV krb5_ktsrvtab_get_name - PROTOTYPE((krb5_context, + (krb5_context, krb5_keytab, char *, - unsigned int)); + unsigned int); krb5_error_code KRB5_CALLCONV krb5_ktsrvtab_close - PROTOTYPE((krb5_context, - krb5_keytab)); + (krb5_context, + krb5_keytab); krb5_error_code KRB5_CALLCONV krb5_ktsrvtab_get_entry - PROTOTYPE((krb5_context, + (krb5_context, krb5_keytab, krb5_const_principal, krb5_kvno, krb5_enctype, - krb5_keytab_entry *)); + krb5_keytab_entry *); krb5_error_code KRB5_CALLCONV krb5_ktsrvtab_start_seq_get - PROTOTYPE((krb5_context, + (krb5_context, krb5_keytab, - krb5_kt_cursor *)); + krb5_kt_cursor *); krb5_error_code KRB5_CALLCONV krb5_ktsrvtab_get_next - PROTOTYPE((krb5_context, + (krb5_context, krb5_keytab, krb5_keytab_entry *, - krb5_kt_cursor *)); + krb5_kt_cursor *); krb5_error_code KRB5_CALLCONV krb5_ktsrvtab_end_get - PROTOTYPE((krb5_context, + (krb5_context, krb5_keytab, - krb5_kt_cursor *)); + krb5_kt_cursor *); krb5_error_code krb5_ktsrvint_open - PROTOTYPE((krb5_context, - krb5_keytab)); + (krb5_context, + krb5_keytab); krb5_error_code krb5_ktsrvint_close - PROTOTYPE((krb5_context, - krb5_keytab)); + (krb5_context, + krb5_keytab); krb5_error_code krb5_ktsrvint_read_entry - PROTOTYPE((krb5_context, + (krb5_context, krb5_keytab, - krb5_keytab_entry *)); + krb5_keytab_entry *); #endif /* KRB5_KTSRVTAB__ */ diff --git a/src/lib/krb5/krb/ChangeLog b/src/lib/krb5/krb/ChangeLog index 65d9b6e69..ee68a87e1 100644 --- a/src/lib/krb5/krb/ChangeLog +++ b/src/lib/krb5/krb/ChangeLog @@ -1,3 +1,11 @@ +2001-10-09 Ken Raeburn <raeburn@mit.edu> + + * get_in_tkt.c, in_tkt_ktb.c, in_tkt_pwd.c, in_tkt_sky.c, + int-proto.h, mk_req_ext.c, pr_to_salt.c, rd_req_dec.c, ser_actx.c, + ser_adata.c, ser_addr.c, ser_auth.c, ser_cksum.c, ser_ctx.c, + ser_eblk.c, ser_key.c, ser_princ.c, t_kerb.c: Make prototypes + unconditional. + 2001-10-05 Ken Raeburn <raeburn@mit.edu> * init_ctx.c, preauth.c: Drop _MSDOS support. diff --git a/src/lib/krb5/krb/get_in_tkt.c b/src/lib/krb5/krb/get_in_tkt.c index 0a8f690ee..d6e469d8d 100644 --- a/src/lib/krb5/krb/get_in_tkt.c +++ b/src/lib/krb5/krb/get_in_tkt.c @@ -64,20 +64,20 @@ /* some typedef's for the function args to make things look a bit cleaner */ -typedef krb5_error_code (*git_key_proc) PROTOTYPE((krb5_context, +typedef krb5_error_code (*git_key_proc) (krb5_context, const krb5_enctype, krb5_data *, krb5_const_pointer, - krb5_keyblock **)); + krb5_keyblock **); -typedef krb5_error_code (*git_decrypt_proc) PROTOTYPE((krb5_context, +typedef krb5_error_code (*git_decrypt_proc) (krb5_context, const krb5_keyblock *, krb5_const_pointer, - krb5_kdc_rep * )); + krb5_kdc_rep * ); -static krb5_error_code make_preauth_list PROTOTYPE((krb5_context, +static krb5_error_code make_preauth_list (krb5_context, krb5_preauthtype *, - int, krb5_pa_data ***)); + int, krb5_pa_data ***); /* * This function sends a request to the KDC, and gets back a response; * the response is parsed into ret_err_reply or ret_as_reply if the diff --git a/src/lib/krb5/krb/in_tkt_ktb.c b/src/lib/krb5/krb/in_tkt_ktb.c index cb9c41e1a..9991c9709 100644 --- a/src/lib/krb5/krb/in_tkt_ktb.c +++ b/src/lib/krb5/krb/in_tkt_ktb.c @@ -41,11 +41,11 @@ struct keytab_keyproc_arg { * from system area. */ static krb5_error_code keytab_keyproc - PROTOTYPE((krb5_context, + (krb5_context, const krb5_enctype, krb5_data *, krb5_const_pointer, - krb5_keyblock **)); + krb5_keyblock **); static krb5_error_code keytab_keyproc(context, type, salt, keyseed, key) diff --git a/src/lib/krb5/krb/in_tkt_pwd.c b/src/lib/krb5/krb/in_tkt_pwd.c index b494f1194..775a85f98 100644 --- a/src/lib/krb5/krb/in_tkt_pwd.c +++ b/src/lib/krb5/krb/in_tkt_pwd.c @@ -35,11 +35,11 @@ extern char *krb5_default_pwd_prompt1; * key-producing procedure for use by krb5_get_in_tkt_with_password. */ static krb5_error_code pwd_keyproc - PROTOTYPE((krb5_context, + (krb5_context, const krb5_enctype, krb5_data *, krb5_const_pointer, - krb5_keyblock **)); + krb5_keyblock **); static krb5_error_code pwd_keyproc(context, type, salt, keyseed, key) diff --git a/src/lib/krb5/krb/in_tkt_sky.c b/src/lib/krb5/krb/in_tkt_sky.c index 0ca1e7ef2..245a03243 100644 --- a/src/lib/krb5/krb/in_tkt_sky.c +++ b/src/lib/krb5/krb/in_tkt_sky.c @@ -41,11 +41,11 @@ struct skey_keyproc_arg { * from system area. */ static krb5_error_code skey_keyproc - PROTOTYPE((krb5_context, + (krb5_context, const krb5_enctype, krb5_data *, krb5_const_pointer, - krb5_keyblock **)); + krb5_keyblock **); static krb5_error_code skey_keyproc(context, type, salt, keyseed, key) diff --git a/src/lib/krb5/krb/int-proto.h b/src/lib/krb5/krb/int-proto.h index d2df9f875..75ffa55f7 100644 --- a/src/lib/krb5/krb/int-proto.h +++ b/src/lib/krb5/krb/int-proto.h @@ -32,21 +32,21 @@ #define KRB5_INT_FUNC_PROTO__ krb5_error_code krb5_tgtname - PROTOTYPE((krb5_context context, + (krb5_context context, const krb5_data *, const krb5_data *, - krb5_principal *)); + krb5_principal *); krb5_error_code krb5_libdefault_boolean - KRB5_PROTOTYPE((krb5_context, const krb5_data *, const char *, - int *)); + (krb5_context, const krb5_data *, const char *, + int *); -krb5_error_code krb5_ser_authdata_init KRB5_PROTOTYPE((krb5_context)); -krb5_error_code krb5_ser_address_init KRB5_PROTOTYPE((krb5_context)); -krb5_error_code krb5_ser_authenticator_init KRB5_PROTOTYPE((krb5_context)); -krb5_error_code krb5_ser_checksum_init KRB5_PROTOTYPE((krb5_context)); -krb5_error_code krb5_ser_keyblock_init KRB5_PROTOTYPE((krb5_context)); -krb5_error_code krb5_ser_principal_init KRB5_PROTOTYPE((krb5_context)); +krb5_error_code krb5_ser_authdata_init (krb5_context); +krb5_error_code krb5_ser_address_init (krb5_context); +krb5_error_code krb5_ser_authenticator_init (krb5_context); +krb5_error_code krb5_ser_checksum_init (krb5_context); +krb5_error_code krb5_ser_keyblock_init (krb5_context); +krb5_error_code krb5_ser_principal_init (krb5_context); #endif /* KRB5_INT_FUNC_PROTO__ */ diff --git a/src/lib/krb5/krb/mk_req_ext.c b/src/lib/krb5/krb/mk_req_ext.c index 8b7b5bb42..7725746c9 100644 --- a/src/lib/krb5/krb/mk_req_ext.c +++ b/src/lib/krb5/krb/mk_req_ext.c @@ -65,10 +65,10 @@ */ static krb5_error_code -krb5_generate_authenticator PROTOTYPE((krb5_context, +krb5_generate_authenticator (krb5_context, krb5_authenticator *, krb5_principal, krb5_checksum *, krb5_keyblock *, - krb5_int32, krb5_authdata ** )); + krb5_int32, krb5_authdata ** ); krb5_error_code KRB5_CALLCONV krb5_mk_req_extended(context, auth_context, ap_req_options, in_data, in_creds, diff --git a/src/lib/krb5/krb/pr_to_salt.c b/src/lib/krb5/krb/pr_to_salt.c index 9efe1b7cd..00d4f9f01 100644 --- a/src/lib/krb5/krb/pr_to_salt.c +++ b/src/lib/krb5/krb/pr_to_salt.c @@ -30,7 +30,7 @@ #include "k5-int.h" static krb5_error_code krb5_principal2salt_internal - PROTOTYPE((krb5_context, krb5_const_principal, krb5_data *ret, int)); + (krb5_context, krb5_const_principal, krb5_data *ret, int); /* * Convert a krb5_principal into the default salt for that principal. diff --git a/src/lib/krb5/krb/rd_req_dec.c b/src/lib/krb5/krb/rd_req_dec.c index 31c02dd27..0eed509e1 100644 --- a/src/lib/krb5/krb/rd_req_dec.c +++ b/src/lib/krb5/krb/rd_req_dec.c @@ -60,8 +60,8 @@ */ static krb5_error_code decrypt_authenticator - PROTOTYPE((krb5_context, const krb5_ap_req *, krb5_authenticator **, - int)); + (krb5_context, const krb5_ap_req *, krb5_authenticator **, + int); #define in_clock_skew(date) (labs((date)-currenttime) < context->clockskew) diff --git a/src/lib/krb5/krb/ser_actx.c b/src/lib/krb5/krb/ser_actx.c index aa634cc2e..ec82aaa9e 100644 --- a/src/lib/krb5/krb/ser_actx.c +++ b/src/lib/krb5/krb/ser_actx.c @@ -47,11 +47,11 @@ * krb5_auth_context_internalize(); */ static krb5_error_code krb5_auth_context_size - KRB5_PROTOTYPE((krb5_context, krb5_pointer, size_t *)); + (krb5_context, krb5_pointer, size_t *); static krb5_error_code krb5_auth_context_externalize - KRB5_PROTOTYPE((krb5_context, krb5_pointer, krb5_octet **, size_t *)); + (krb5_context, krb5_pointer, krb5_octet **, size_t *); static krb5_error_code krb5_auth_context_internalize - KRB5_PROTOTYPE((krb5_context,krb5_pointer *, krb5_octet **, size_t *)); + (krb5_context,krb5_pointer *, krb5_octet **, size_t *); /* * Other metadata serialization initializers. diff --git a/src/lib/krb5/krb/ser_adata.c b/src/lib/krb5/krb/ser_adata.c index 1293a9b91..0f27e8951 100644 --- a/src/lib/krb5/krb/ser_adata.c +++ b/src/lib/krb5/krb/ser_adata.c @@ -38,11 +38,11 @@ * krb5_authdata_internalize(); */ static krb5_error_code krb5_authdata_size - KRB5_PROTOTYPE((krb5_context, krb5_pointer, size_t *)); + (krb5_context, krb5_pointer, size_t *); static krb5_error_code krb5_authdata_externalize - KRB5_PROTOTYPE((krb5_context, krb5_pointer, krb5_octet **, size_t *)); + (krb5_context, krb5_pointer, krb5_octet **, size_t *); static krb5_error_code krb5_authdata_internalize - KRB5_PROTOTYPE((krb5_context,krb5_pointer *, krb5_octet **, size_t *)); + (krb5_context,krb5_pointer *, krb5_octet **, size_t *); /* Local data */ static const krb5_ser_entry krb5_authdata_ser_entry = { diff --git a/src/lib/krb5/krb/ser_addr.c b/src/lib/krb5/krb/ser_addr.c index 196ecb2f6..098896036 100644 --- a/src/lib/krb5/krb/ser_addr.c +++ b/src/lib/krb5/krb/ser_addr.c @@ -38,11 +38,11 @@ * krb5_address_internalize(); */ static krb5_error_code krb5_address_size - KRB5_PROTOTYPE((krb5_context, krb5_pointer, size_t *)); + (krb5_context, krb5_pointer, size_t *); static krb5_error_code krb5_address_externalize - KRB5_PROTOTYPE((krb5_context, krb5_pointer, krb5_octet **, size_t *)); + (krb5_context, krb5_pointer, krb5_octet **, size_t *); static krb5_error_code krb5_address_internalize - KRB5_PROTOTYPE((krb5_context,krb5_pointer *, krb5_octet **, size_t *)); + (krb5_context,krb5_pointer *, krb5_octet **, size_t *); /* Local data */ static const krb5_ser_entry krb5_address_ser_entry = { diff --git a/src/lib/krb5/krb/ser_auth.c b/src/lib/krb5/krb/ser_auth.c index 5c21ebdef..983ce8bac 100644 --- a/src/lib/krb5/krb/ser_auth.c +++ b/src/lib/krb5/krb/ser_auth.c @@ -38,11 +38,11 @@ * krb5_authenticator_internalize(); */ static krb5_error_code krb5_authenticator_size - KRB5_PROTOTYPE((krb5_context, krb5_pointer, size_t *)); + (krb5_context, krb5_pointer, size_t *); static krb5_error_code krb5_authenticator_externalize - KRB5_PROTOTYPE((krb5_context, krb5_pointer, krb5_octet **, size_t *)); + (krb5_context, krb5_pointer, krb5_octet **, size_t *); static krb5_error_code krb5_authenticator_internalize - KRB5_PROTOTYPE((krb5_context,krb5_pointer *, krb5_octet **, size_t *)); + (krb5_context,krb5_pointer *, krb5_octet **, size_t *); /* Local data */ static const krb5_ser_entry krb5_authenticator_ser_entry = { diff --git a/src/lib/krb5/krb/ser_cksum.c b/src/lib/krb5/krb/ser_cksum.c index ac9757401..101c853e2 100644 --- a/src/lib/krb5/krb/ser_cksum.c +++ b/src/lib/krb5/krb/ser_cksum.c @@ -38,11 +38,11 @@ * krb5_checksum_internalize(); */ static krb5_error_code krb5_checksum_esize - KRB5_PROTOTYPE((krb5_context, krb5_pointer, size_t *)); + (krb5_context, krb5_pointer, size_t *); static krb5_error_code krb5_checksum_externalize - KRB5_PROTOTYPE((krb5_context, krb5_pointer, krb5_octet **, size_t *)); + (krb5_context, krb5_pointer, krb5_octet **, size_t *); static krb5_error_code krb5_checksum_internalize - KRB5_PROTOTYPE((krb5_context,krb5_pointer *, krb5_octet **, size_t *)); + (krb5_context,krb5_pointer *, krb5_octet **, size_t *); /* Local data */ static const krb5_ser_entry krb5_checksum_ser_entry = { diff --git a/src/lib/krb5/krb/ser_ctx.c b/src/lib/krb5/krb/ser_ctx.c index c957a817b..5c6647e86 100644 --- a/src/lib/krb5/krb/ser_ctx.c +++ b/src/lib/krb5/krb/ser_ctx.c @@ -51,23 +51,23 @@ * krb5_ser_context_init(); */ static krb5_error_code krb5_context_size - KRB5_PROTOTYPE((krb5_context, krb5_pointer, size_t *)); + (krb5_context, krb5_pointer, size_t *); static krb5_error_code krb5_context_externalize - KRB5_PROTOTYPE((krb5_context, krb5_pointer, krb5_octet **, size_t *)); + (krb5_context, krb5_pointer, krb5_octet **, size_t *); static krb5_error_code krb5_context_internalize - KRB5_PROTOTYPE((krb5_context,krb5_pointer *, krb5_octet **, size_t *)); + (krb5_context,krb5_pointer *, krb5_octet **, size_t *); static krb5_error_code krb5_oscontext_size - KRB5_PROTOTYPE((krb5_context, krb5_pointer, size_t *)); + (krb5_context, krb5_pointer, size_t *); static krb5_error_code krb5_oscontext_externalize - KRB5_PROTOTYPE((krb5_context, krb5_pointer, krb5_octet **, size_t *)); + (krb5_context, krb5_pointer, krb5_octet **, size_t *); static krb5_error_code krb5_oscontext_internalize - KRB5_PROTOTYPE((krb5_context,krb5_pointer *, krb5_octet **, size_t *)); + (krb5_context,krb5_pointer *, krb5_octet **, size_t *); krb5_error_code profile_ser_size - KRB5_PROTOTYPE((krb5_context, krb5_pointer, size_t *)); + (krb5_context, krb5_pointer, size_t *); krb5_error_code profile_ser_externalize - KRB5_PROTOTYPE((krb5_context, krb5_pointer, krb5_octet **, size_t *)); + (krb5_context, krb5_pointer, krb5_octet **, size_t *); krb5_error_code profile_ser_internalize - KRB5_PROTOTYPE((krb5_context,krb5_pointer *, krb5_octet **, size_t *)); + (krb5_context,krb5_pointer *, krb5_octet **, size_t *); /* Local data */ static const krb5_ser_entry krb5_context_ser_entry = { diff --git a/src/lib/krb5/krb/ser_eblk.c b/src/lib/krb5/krb/ser_eblk.c index bd4b4c594..aed806ce1 100644 --- a/src/lib/krb5/krb/ser_eblk.c +++ b/src/lib/krb5/krb/ser_eblk.c @@ -39,11 +39,11 @@ * krb5_encrypt_block_internalize(); */ static krb5_error_code krb5_encrypt_block_size - KRB5_PROTOTYPE((krb5_context, krb5_pointer, size_t *)); + (krb5_context, krb5_pointer, size_t *); static krb5_error_code krb5_encrypt_block_externalize - KRB5_PROTOTYPE((krb5_context, krb5_pointer, krb5_octet **, size_t *)); + (krb5_context, krb5_pointer, krb5_octet **, size_t *); static krb5_error_code krb5_encrypt_block_internalize - KRB5_PROTOTYPE((krb5_context,krb5_pointer *, krb5_octet **, size_t *)); + (krb5_context,krb5_pointer *, krb5_octet **, size_t *); /* Local data */ static const krb5_ser_entry krb5_encrypt_block_ser_entry = { diff --git a/src/lib/krb5/krb/ser_key.c b/src/lib/krb5/krb/ser_key.c index 9ea7b1cdb..a7ef5d0d4 100644 --- a/src/lib/krb5/krb/ser_key.c +++ b/src/lib/krb5/krb/ser_key.c @@ -38,11 +38,11 @@ * krb5_keyblock_internalize(); */ static krb5_error_code krb5_keyblock_size - KRB5_PROTOTYPE((krb5_context, krb5_pointer, size_t *)); + (krb5_context, krb5_pointer, size_t *); static krb5_error_code krb5_keyblock_externalize - KRB5_PROTOTYPE((krb5_context, krb5_pointer, krb5_octet **, size_t *)); + (krb5_context, krb5_pointer, krb5_octet **, size_t *); static krb5_error_code krb5_keyblock_internalize - KRB5_PROTOTYPE((krb5_context,krb5_pointer *, krb5_octet **, size_t *)); + (krb5_context,krb5_pointer *, krb5_octet **, size_t *); /* Local data */ static const krb5_ser_entry krb5_keyblock_ser_entry = { diff --git a/src/lib/krb5/krb/ser_princ.c b/src/lib/krb5/krb/ser_princ.c index 4435f6e6d..148c3d554 100644 --- a/src/lib/krb5/krb/ser_princ.c +++ b/src/lib/krb5/krb/ser_princ.c @@ -38,11 +38,11 @@ * krb5_principal_internalize(); */ static krb5_error_code krb5_principal_size - KRB5_PROTOTYPE((krb5_context, krb5_pointer, size_t *)); + (krb5_context, krb5_pointer, size_t *); static krb5_error_code krb5_principal_externalize - KRB5_PROTOTYPE((krb5_context, krb5_pointer, krb5_octet **, size_t *)); + (krb5_context, krb5_pointer, krb5_octet **, size_t *); static krb5_error_code krb5_principal_internalize - KRB5_PROTOTYPE((krb5_context,krb5_pointer *, krb5_octet **, size_t *)); + (krb5_context,krb5_pointer *, krb5_octet **, size_t *); /* Local data */ static const krb5_ser_entry krb5_principal_ser_entry = { diff --git a/src/lib/krb5/krb/t_kerb.c b/src/lib/krb5/krb/t_kerb.c index 89242d9cd..485f58419 100644 --- a/src/lib/krb5/krb/t_kerb.c +++ b/src/lib/krb5/krb/t_kerb.c @@ -16,12 +16,12 @@ #include "com_err.h" -void test_string_to_timestamp KRB5_PROTOTYPE((krb5_context, char *)); -void test_425_conv_principal KRB5_PROTOTYPE((krb5_context, char *, char*, char *)); -void test_524_conv_principal KRB5_PROTOTYPE((krb5_context, char *)); -void test_parse_name KRB5_PROTOTYPE((krb5_context, const char *)); -void test_set_realm KRB5_PROTOTYPE((krb5_context, const char *, const char *)); -void usage KRB5_PROTOTYPE((char *)); +void test_string_to_timestamp (krb5_context, char *); +void test_425_conv_principal (krb5_context, char *, char*, char *); +void test_524_conv_principal (krb5_context, char *); +void test_parse_name (krb5_context, const char *); +void test_set_realm (krb5_context, const char *, const char *); +void usage (char *); void test_string_to_timestamp(ctx, ktime) krb5_context ctx; diff --git a/src/lib/krb5/os/ChangeLog b/src/lib/krb5/os/ChangeLog index b5c0e139e..a39c1f1f6 100644 --- a/src/lib/krb5/os/ChangeLog +++ b/src/lib/krb5/os/ChangeLog @@ -1,3 +1,7 @@ +2001-10-09 Ken Raeburn <raeburn@mit.edu> + + * os-proto.h: Make prototypes unconditional. + 2001-10-05 Ken Raeburn <raeburn@mit.edu> * an_to_ln.c, c_ustime.c, ccdefname.c, init_os_ctx.c, ktdefname.c, diff --git a/src/lib/krb5/os/os-proto.h b/src/lib/krb5/os/os-proto.h index 7be2c3fc6..48910b51b 100644 --- a/src/lib/krb5/os/os-proto.h +++ b/src/lib/krb5/os/os-proto.h @@ -32,22 +32,22 @@ #ifdef SOCK_DGRAM /* XXX hack... */ krb5_error_code krb5_locate_kdc - PROTOTYPE((krb5_context, const krb5_data *, struct addrlist *, int)); + (krb5_context, const krb5_data *, struct addrlist *, int); #endif #ifdef HAVE_NETINET_IN_H krb5_error_code krb5_unpack_full_ipaddr - PROTOTYPE((krb5_context, + (krb5_context, const krb5_address *, krb5_int32 *, - krb5_int16 *)); + krb5_int16 *); krb5_error_code krb5_make_full_ipaddr - PROTOTYPE((krb5_context, + (krb5_context, krb5_int32, int, /* unsigned short promotes to signed int */ - krb5_address **)); + krb5_address **); #endif /* HAVE_NETINET_IN_H */ @@ -57,9 +57,9 @@ krb5_error_code krb5_try_realm_txt_rr(const char *, const char *, /* Obsolete interface - leave prototype here until code removed */ krb5_error_code krb5_secure_config_files(krb5_context ctx); -int _krb5_use_dns_realm KRB5_PROTOTYPE((krb5_context)); -int _krb5_use_dns_kdc KRB5_PROTOTYPE((krb5_context)); -int _krb5_conf_boolean KRB5_PROTOTYPE((const char *)); +int _krb5_use_dns_realm (krb5_context); +int _krb5_use_dns_kdc (krb5_context); +int _krb5_conf_boolean (const char *); extern unsigned int krb5_max_skdc_timeout; extern unsigned int krb5_skdc_timeout_shift; diff --git a/src/lib/krb5/rcache/ChangeLog b/src/lib/krb5/rcache/ChangeLog index 23c28a3f0..b57895de8 100644 --- a/src/lib/krb5/rcache/ChangeLog +++ b/src/lib/krb5/rcache/ChangeLog @@ -1,3 +1,7 @@ +2001-10-09 Ken Raeburn <raeburn@mit.edu> + + * rc_dfl.h, rc_io.h, ser_rc.c: Make prototypes unconditional. + 2001-10-05 Ken Raeburn <raeburn@mit.edu> * rc_io.c: Drop _MSDOS support. diff --git a/src/lib/krb5/rcache/rc_dfl.h b/src/lib/krb5/rcache/rc_dfl.h index aaa5e820d..51c62ef31 100644 --- a/src/lib/krb5/rcache/rc_dfl.h +++ b/src/lib/krb5/rcache/rc_dfl.h @@ -16,41 +16,41 @@ extern krb5_rc_ops krb5_rc_dfl_ops; /* initialized to the following */ krb5_error_code KRB5_CALLCONV krb5_rc_dfl_init - PROTOTYPE((krb5_context, + (krb5_context, krb5_rcache, - krb5_deltat)); + krb5_deltat); krb5_error_code KRB5_CALLCONV krb5_rc_dfl_recover - PROTOTYPE((krb5_context, - krb5_rcache)); + (krb5_context, + krb5_rcache); krb5_error_code KRB5_CALLCONV krb5_rc_dfl_destroy - PROTOTYPE((krb5_context, - krb5_rcache)); + (krb5_context, + krb5_rcache); krb5_error_code KRB5_CALLCONV krb5_rc_dfl_close - PROTOTYPE((krb5_context, - krb5_rcache)); + (krb5_context, + krb5_rcache); krb5_error_code KRB5_CALLCONV krb5_rc_dfl_store - PROTOTYPE((krb5_context, + (krb5_context, krb5_rcache, - krb5_donot_replay *)); + krb5_donot_replay *); krb5_error_code KRB5_CALLCONV krb5_rc_dfl_expunge - PROTOTYPE((krb5_context, - krb5_rcache)); + (krb5_context, + krb5_rcache); krb5_error_code KRB5_CALLCONV krb5_rc_dfl_get_span - PROTOTYPE((krb5_context, + (krb5_context, krb5_rcache, - krb5_deltat *)); + krb5_deltat *); char * KRB5_CALLCONV krb5_rc_dfl_get_name - PROTOTYPE((krb5_context, - krb5_rcache)); + (krb5_context, + krb5_rcache); krb5_error_code KRB5_CALLCONV krb5_rc_dfl_resolve - PROTOTYPE((krb5_context, + (krb5_context, krb5_rcache, - char *)); + char *); krb5_error_code krb5_rc_dfl_close_no_free - PROTOTYPE((krb5_context, - krb5_rcache)); + (krb5_context, + krb5_rcache); void krb5_rc_free_entry - PROTOTYPE((krb5_context, - krb5_donot_replay **)); + (krb5_context, + krb5_donot_replay **); #endif diff --git a/src/lib/krb5/rcache/rc_io.h b/src/lib/krb5/rcache/rc_io.h index 8a1c241c7..77eb34f0b 100644 --- a/src/lib/krb5/rcache/rc_io.h +++ b/src/lib/krb5/rcache/rc_io.h @@ -28,43 +28,43 @@ krb5_rc_iostuff; /* first argument is always iostuff for result file */ krb5_error_code krb5_rc_io_creat - PROTOTYPE((krb5_context, + (krb5_context, krb5_rc_iostuff *, - char **)); + char **); krb5_error_code krb5_rc_io_open - PROTOTYPE((krb5_context, + (krb5_context, krb5_rc_iostuff *, - char *)); + char *); krb5_error_code krb5_rc_io_move - PROTOTYPE((krb5_context, + (krb5_context, krb5_rc_iostuff *, - krb5_rc_iostuff *)); + krb5_rc_iostuff *); krb5_error_code krb5_rc_io_write - PROTOTYPE((krb5_context, + (krb5_context, krb5_rc_iostuff *, krb5_pointer, - unsigned int)); + unsigned int); krb5_error_code krb5_rc_io_read - PROTOTYPE((krb5_context, + (krb5_context, krb5_rc_iostuff *, krb5_pointer, - unsigned int)); + unsigned int); krb5_error_code krb5_rc_io_close - PROTOTYPE((krb5_context, - krb5_rc_iostuff *)); + (krb5_context, + krb5_rc_iostuff *); krb5_error_code krb5_rc_io_destroy - PROTOTYPE((krb5_context, - krb5_rc_iostuff *)); + (krb5_context, + krb5_rc_iostuff *); krb5_error_code krb5_rc_io_mark - PROTOTYPE((krb5_context, - krb5_rc_iostuff *)); + (krb5_context, + krb5_rc_iostuff *); krb5_error_code krb5_rc_io_unmark - PROTOTYPE((krb5_context, - krb5_rc_iostuff *)); + (krb5_context, + krb5_rc_iostuff *); krb5_error_code krb5_rc_io_sync - PROTOTYPE((krb5_context, - krb5_rc_iostuff *)); + (krb5_context, + krb5_rc_iostuff *); long krb5_rc_io_size - PROTOTYPE((krb5_context, - krb5_rc_iostuff *)); + (krb5_context, + krb5_rc_iostuff *); #endif diff --git a/src/lib/krb5/rcache/ser_rc.c b/src/lib/krb5/rcache/ser_rc.c index 2df993ffc..a4ed0f88b 100644 --- a/src/lib/krb5/rcache/ser_rc.c +++ b/src/lib/krb5/rcache/ser_rc.c @@ -37,11 +37,11 @@ * krb5_rcache_internalize(); */ static krb5_error_code krb5_rcache_size - KRB5_PROTOTYPE((krb5_context, krb5_pointer, size_t *)); + (krb5_context, krb5_pointer, size_t *); static krb5_error_code krb5_rcache_externalize - KRB5_PROTOTYPE((krb5_context, krb5_pointer, krb5_octet **, size_t *)); + (krb5_context, krb5_pointer, krb5_octet **, size_t *); static krb5_error_code krb5_rcache_internalize - KRB5_PROTOTYPE((krb5_context,krb5_pointer *, krb5_octet **, size_t *)); + (krb5_context,krb5_pointer *, krb5_octet **, size_t *); /* * Serialization entry for this type. |