From 26af7a56857db8f36b7f6c7f7750ef66e5a43230 Mon Sep 17 00:00:00 2001 From: John Kohl Date: Wed, 18 Apr 1990 17:44:02 +0000 Subject: [PATCH] add const to function signatures as appropriate git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@495 dc483132-0cff-0310-8789-dd5450dbe970 --- src/lib/krb5/krb/addr_comp.c | 3 ++- src/lib/krb5/krb/addr_srch.c | 4 ++-- src/lib/krb5/krb/copy_creds.c | 3 ++- src/lib/krb5/krb/copy_data.c | 3 ++- src/lib/krb5/krb/copy_key.c | 2 +- src/lib/krb5/krb/copy_princ.c | 3 ++- src/lib/krb5/krb/decode_kdc.c | 12 ++++++------ src/lib/krb5/krb/decrypt_tk.c | 2 +- src/lib/krb5/krb/encrypt_tk.c | 2 +- src/lib/krb5/krb/faddr_ordr.c | 3 ++- src/lib/krb5/krb/get_in_tkt.c | 24 +++++++++++------------ src/lib/krb5/krb/parse.c | 4 ++-- src/lib/krb5/krb/princ_comp.c | 3 ++- src/lib/krb5/krb/send_tgs.c | 36 +++++++++++++++++------------------ src/lib/krb5/krb/unparse.c | 2 +- src/lib/krb5/os/def_realm.c | 2 +- 16 files changed, 57 insertions(+), 51 deletions(-) diff --git a/src/lib/krb5/krb/addr_comp.c b/src/lib/krb5/krb/addr_comp.c index 9777e475a..3a455e5e9 100644 --- a/src/lib/krb5/krb/addr_comp.c +++ b/src/lib/krb5/krb/addr_comp.c @@ -24,7 +24,8 @@ static char addr_comp_c[] = */ krb5_boolean krb5_address_compare(addr1, addr2) -krb5_address *addr1, *addr2; +const krb5_address *addr1; +const krb5_address *addr2; { if (addr1->addrtype != addr2->addrtype) return(FALSE); diff --git a/src/lib/krb5/krb/addr_srch.c b/src/lib/krb5/krb/addr_srch.c index fedb3fa0b..c1e7641a3 100644 --- a/src/lib/krb5/krb/addr_srch.c +++ b/src/lib/krb5/krb/addr_srch.c @@ -24,8 +24,8 @@ static char addr_srch_c[] = */ krb5_boolean krb5_address_search(addr, addrlist) -krb5_address *addr; -krb5_address **addrlist; +const krb5_address *addr; +const krb5_address **addrlist; { if (!addrlist) return TRUE; diff --git a/src/lib/krb5/krb/copy_creds.c b/src/lib/krb5/krb/copy_creds.c index 19f7b45e0..cf1914575 100644 --- a/src/lib/krb5/krb/copy_creds.c +++ b/src/lib/krb5/krb/copy_creds.c @@ -30,7 +30,8 @@ static char rcsid_copy_creds_c [] = krb5_error_code krb5_copy_creds(incred, outcred) -krb5_creds *incred, **outcred; +const krb5_creds *incred; +krb5_creds **outcred; { krb5_creds *tempcred; krb5_error_code retval; diff --git a/src/lib/krb5/krb/copy_data.c b/src/lib/krb5/krb/copy_data.c index 7a84e5f8c..9eaf87d4d 100644 --- a/src/lib/krb5/krb/copy_data.c +++ b/src/lib/krb5/krb/copy_data.c @@ -25,7 +25,8 @@ static char rcsid_copy_data_c[] = */ krb5_error_code krb5_copy_data(indata, outdata) -krb5_data *indata, **outdata; +const krb5_data *indata; +krb5_data **outdata; { krb5_data *tempdata; diff --git a/src/lib/krb5/krb/copy_key.c b/src/lib/krb5/krb/copy_key.c index 0d6a2b61b..e88cb75e8 100644 --- a/src/lib/krb5/krb/copy_key.c +++ b/src/lib/krb5/krb/copy_key.c @@ -26,7 +26,7 @@ static char copy_key_c[] = */ krb5_error_code krb5_copy_keyblock(from, to) -krb5_keyblock *from; +const krb5_keyblock *from; krb5_keyblock *to; { *to = *from; diff --git a/src/lib/krb5/krb/copy_princ.c b/src/lib/krb5/krb/copy_princ.c index c450b90cc..050479fe1 100644 --- a/src/lib/krb5/krb/copy_princ.c +++ b/src/lib/krb5/krb/copy_princ.c @@ -26,7 +26,8 @@ static char rcsid_copy_princ_c[] = */ krb5_error_code krb5_copy_principal(inprinc, outprinc) -krb5_principal inprinc, *outprinc; +const krb5_principal inprinc; +krb5_principal *outprinc; { krb5_error_code retval; krb5_principal tempprinc; diff --git a/src/lib/krb5/krb/decode_kdc.c b/src/lib/krb5/krb/decode_kdc.c index f01600c5b..863225293 100644 --- a/src/lib/krb5/krb/decode_kdc.c +++ b/src/lib/krb5/krb/decode_kdc.c @@ -40,13 +40,13 @@ static char rcsid_decode_kdc_c[] = */ krb5_error_code -krb5_decode_kdc_rep(DECLARG(krb5_data *, enc_rep), - DECLARG(krb5_keyblock *, key), - DECLARG(krb5_enctype, etype), +krb5_decode_kdc_rep(DECLARG(const krb5_data *, enc_rep), + DECLARG(const krb5_keyblock *, key), + DECLARG(const krb5_enctype, etype), DECLARG(krb5_kdc_rep **, dec_rep)) -OLDDECLARG(krb5_data *, enc_rep) -OLDDECLARG(krb5_keyblock *, key) -OLDDECLARG(krb5_enctype, etype) +OLDDECLARG(const krb5_data *, enc_rep) +OLDDECLARG(const krb5_keyblock *, key) +OLDDECLARG(const krb5_enctype, etype) OLDDECLARG(krb5_kdc_rep **, dec_rep) { krb5_error_code retval; diff --git a/src/lib/krb5/krb/decrypt_tk.c b/src/lib/krb5/krb/decrypt_tk.c index 833e60d7d..513f407b5 100644 --- a/src/lib/krb5/krb/decrypt_tk.c +++ b/src/lib/krb5/krb/decrypt_tk.c @@ -36,7 +36,7 @@ static char rcsid_decrypt_tk_c[] = krb5_error_code krb5_decrypt_tkt_part(srv_key, ticket) -krb5_keyblock *srv_key; +const krb5_keyblock *srv_key; register krb5_ticket *ticket; { krb5_enc_tkt_part *dec_tkt_part; diff --git a/src/lib/krb5/krb/encrypt_tk.c b/src/lib/krb5/krb/encrypt_tk.c index 9ae3ca815..7c9865979 100644 --- a/src/lib/krb5/krb/encrypt_tk.c +++ b/src/lib/krb5/krb/encrypt_tk.c @@ -37,7 +37,7 @@ static char rcsid_encrypt_tk_c[] = krb5_error_code krb5_encrypt_tkt_part(srv_key, dec_ticket) -krb5_keyblock *srv_key; +const krb5_keyblock *srv_key; register krb5_ticket *dec_ticket; { krb5_data *scratch; diff --git a/src/lib/krb5/krb/faddr_ordr.c b/src/lib/krb5/krb/faddr_ordr.c index 2139f3b8a..889969cbf 100644 --- a/src/lib/krb5/krb/faddr_ordr.c +++ b/src/lib/krb5/krb/faddr_ordr.c @@ -29,7 +29,8 @@ static char addr_comp_c[] = */ int krb5_fulladdr_order(addr1, addr2) -krb5_fulladdr *addr1, *addr2; +const krb5_fulladdr *addr1; +const krb5_fulladdr *addr2; { int dir; dir = addr1->address->addrtype - addr2->address->addrtype; diff --git a/src/lib/krb5/krb/get_in_tkt.c b/src/lib/krb5/krb/get_in_tkt.c index b83d95207..7a2d73b54 100644 --- a/src/lib/krb5/krb/get_in_tkt.c +++ b/src/lib/krb5/krb/get_in_tkt.c @@ -64,24 +64,24 @@ typedef krb5_error_code (*git_decrypt_proc) PROTOTYPE((krb5_keyblock *, krb5_pointer, krb5_kdc_rep * )); krb5_error_code -krb5_get_in_tkt(DECLARG(krb5_flags, options), - DECLARG(krb5_address **, addrs), - DECLARG(krb5_enctype, etype), - DECLARG(krb5_keytype, keytype), +krb5_get_in_tkt(DECLARG(const krb5_flags, options), + DECLARG(const krb5_address **, addrs), + DECLARG(const krb5_enctype, etype), + DECLARG(const krb5_keytype, keytype), DECLARG(git_key_proc, key_proc), - DECLARG(krb5_pointer, keyseed), + DECLARG(const krb5_pointer, keyseed), DECLARG(git_decrypt_proc, decrypt_proc), - DECLARG(krb5_pointer, decryptarg), + DECLARG(const krb5_pointer, decryptarg), DECLARG(krb5_creds *, creds), DECLARG(krb5_ccache, ccache)) -OLDDECLARG(krb5_flags, options) -OLDDECLARG(krb5_address **, addrs) -OLDDECLARG(krb5_enctype, etype) -OLDDECLARG(krb5_keytype, keytype) +OLDDECLARG(const krb5_flags, options) +OLDDECLARG(const krb5_address **, addrs) +OLDDECLARG(const krb5_enctype, etype) +OLDDECLARG(const krb5_keytype, keytype) OLDDECLARG(git_key_proc, key_proc) -OLDDECLARG(krb5_pointer, keyseed) +OLDDECLARG(const krb5_pointer, keyseed) OLDDECLARG(git_decrypt_proc, decrypt_proc) -OLDDECLARG(krb5_pointer, decryptarg) +OLDDECLARG(const krb5_pointer, decryptarg) OLDDECLARG(krb5_creds *, creds) OLDDECLARG(krb5_ccache, ccache) { diff --git a/src/lib/krb5/krb/parse.c b/src/lib/krb5/krb/parse.c index 29057676c..283f6e049 100644 --- a/src/lib/krb5/krb/parse.c +++ b/src/lib/krb5/krb/parse.c @@ -45,7 +45,7 @@ static char rcsid_parse_c [] = static char * strsave(string) -char *string; +const char *string; { register char *cp; cp = malloc(strlen(string)+1); @@ -56,7 +56,7 @@ char *string; krb5_error_code krb5_parse_name(name, principal) -register char *name; +const register char *name; krb5_principal *principal; { register char *realmptr, *cp, *endcomponent; diff --git a/src/lib/krb5/krb/princ_comp.c b/src/lib/krb5/krb/princ_comp.c index 328d16c18..bbff5d28b 100644 --- a/src/lib/krb5/krb/princ_comp.c +++ b/src/lib/krb5/krb/princ_comp.c @@ -27,7 +27,8 @@ static char rcsid_princ_comp_c[] = krb5_boolean krb5_principal_compare(princ1, princ2) -krb5_principal princ1, princ2; +const krb5_principal princ1; +const krb5_principal princ2; { register krb5_data **p1, **p2; diff --git a/src/lib/krb5/krb/send_tgs.c b/src/lib/krb5/krb/send_tgs.c index 1960c5dd0..51ca09c1d 100644 --- a/src/lib/krb5/krb/send_tgs.c +++ b/src/lib/krb5/krb/send_tgs.c @@ -42,25 +42,25 @@ static char rcsid_send_tgs_c[] = returns system errors */ krb5_error_code -krb5_send_tgs(DECLARG(krb5_flags, kdcoptions), - DECLARG(krb5_ticket_times *,timestruct), - DECLARG(krb5_enctype, etype), - DECLARG(krb5_cksumtype, sumtype), - DECLARG(krb5_principal, sname), - DECLARG(krb5_address **, addrs), - DECLARG(krb5_authdata **,authorization_data), - DECLARG(krb5_data *,second_ticket), - DECLARG(krb5_creds *,usecred), +krb5_send_tgs(DECLARG(const krb5_flags, kdcoptions), + DECLARG(const krb5_ticket_times *,timestruct), + DECLARG(const krb5_enctype, etype), + DECLARG(const krb5_cksumtype, sumtype), + DECLARG(const krb5_principal, sname), + DECLARG(const krb5_address **, addrs), + DECLARG(const krb5_authdata **,authorization_data), + DECLARG(const krb5_data *,second_ticket), + DECLARG(const krb5_creds *,usecred), DECLARG(krb5_response *,rep)) -OLDDECLARG(krb5_flags, kdcoptions) -OLDDECLARG(krb5_ticket_times *,timestruct) -OLDDECLARG(krb5_enctype, etype) -OLDDECLARG(krb5_cksumtype, sumtype) -OLDDECLARG(krb5_principal, sname) -OLDDECLARG(krb5_address **, addrs) -OLDDECLARG(krb5_authdata **,authorization_data) -OLDDECLARG(krb5_data *,second_ticket) -OLDDECLARG(krb5_creds *,usecred) +OLDDECLARG(const krb5_flags, kdcoptions) +OLDDECLARG(const krb5_ticket_times *,timestruct) +OLDDECLARG(const krb5_enctype, etype) +OLDDECLARG(const krb5_cksumtype, sumtype) +OLDDECLARG(const krb5_principal, sname) +OLDDECLARG(const krb5_address **, addrs) +OLDDECLARG(const krb5_authdata **,authorization_data) +OLDDECLARG(const krb5_data *,second_ticket) +OLDDECLARG(const krb5_creds *,usecred) OLDDECLARG(krb5_response *,rep) { krb5_error_code retval; diff --git a/src/lib/krb5/krb/unparse.c b/src/lib/krb5/krb/unparse.c index 8d8d8cf86..0ee112cb8 100644 --- a/src/lib/krb5/krb/unparse.c +++ b/src/lib/krb5/krb/unparse.c @@ -45,7 +45,7 @@ static char rcsid_unparse_c[] = krb5_error_code krb5_unparse_name(principal, name) -krb5_principal principal; +const krb5_principal principal; register char **name; { register char *cp; diff --git a/src/lib/krb5/os/def_realm.c b/src/lib/krb5/os/def_realm.c index 5e4fa6c3f..72b88465e 100644 --- a/src/lib/krb5/os/def_realm.c +++ b/src/lib/krb5/os/def_realm.c @@ -44,7 +44,7 @@ extern char *krb5_config_file; /* extern so can be set at load/runtime */ krb5_error_code krb5_get_default_realm(lnsize, lrealm) -int lnsize; +const int lnsize; char *lrealm; { FILE *config_file; -- 2.26.2