diff options
author | Theodore Tso <tytso@mit.edu> | 1993-10-15 16:52:33 +0000 |
---|---|---|
committer | Theodore Tso <tytso@mit.edu> | 1993-10-15 16:52:33 +0000 |
commit | 5bb27f267ab3039b23452595cf345eecd81acf4d (patch) | |
tree | d2d3a8455fc8c53540fa8fc8ebad73cf42ff86a3 /src/lib/krb5/free | |
parent | 3909e34b87a1a783d63e276568f2549cdc2d2795 (diff) | |
download | krb5-5bb27f267ab3039b23452595cf345eecd81acf4d.zip krb5-5bb27f267ab3039b23452595cf345eecd81acf4d.tar.gz krb5-5bb27f267ab3039b23452595cf345eecd81acf4d.tar.bz2 |
Change use of xfree to krb5_xfree to prevent namespace pollution
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@2670 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib/krb5/free')
30 files changed, 59 insertions, 59 deletions
diff --git a/src/lib/krb5/free/f_addr.c b/src/lib/krb5/free/f_addr.c index a10fc12..3810975 100644 --- a/src/lib/krb5/free/f_addr.c +++ b/src/lib/krb5/free/f_addr.c @@ -38,7 +38,7 @@ krb5_free_address(val) krb5_address *val; { if (val->contents) - xfree(val->contents); - xfree(val); + krb5_xfree(val->contents); + krb5_xfree(val); return; } diff --git a/src/lib/krb5/free/f_address.c b/src/lib/krb5/free/f_address.c index 7017579..3e40d92 100644 --- a/src/lib/krb5/free/f_address.c +++ b/src/lib/krb5/free/f_address.c @@ -41,9 +41,9 @@ krb5_address **val; for (temp = val; *temp; temp++) { if ((*temp)->contents) - xfree((*temp)->contents); - xfree(*temp); + krb5_xfree((*temp)->contents); + krb5_xfree(*temp); } - xfree(val); + krb5_xfree(val); return; } diff --git a/src/lib/krb5/free/f_ap_rep.c b/src/lib/krb5/free/f_ap_rep.c index 46d2e8d..a88a2f6 100644 --- a/src/lib/krb5/free/f_ap_rep.c +++ b/src/lib/krb5/free/f_ap_rep.c @@ -38,7 +38,7 @@ krb5_free_ap_rep(val) register krb5_ap_rep *val; { if (val->enc_part.ciphertext.data) - xfree(val->enc_part.ciphertext.data); - xfree(val); + krb5_xfree(val->enc_part.ciphertext.data); + krb5_xfree(val); return; } diff --git a/src/lib/krb5/free/f_ap_req.c b/src/lib/krb5/free/f_ap_req.c index f9c216b..695bfd1 100644 --- a/src/lib/krb5/free/f_ap_req.c +++ b/src/lib/krb5/free/f_ap_req.c @@ -40,7 +40,7 @@ register krb5_ap_req *val; if (val->ticket) krb5_free_ticket(val->ticket); if (val->authenticator.ciphertext.data) - xfree(val->authenticator.ciphertext.data); - xfree(val); + krb5_xfree(val->authenticator.ciphertext.data); + krb5_xfree(val); return; } diff --git a/src/lib/krb5/free/f_arep_enc.c b/src/lib/krb5/free/f_arep_enc.c index b75c119..bd95176 100644 --- a/src/lib/krb5/free/f_arep_enc.c +++ b/src/lib/krb5/free/f_arep_enc.c @@ -39,6 +39,6 @@ krb5_ap_rep_enc_part *val; { if (val->subkey) krb5_free_keyblock(val->subkey); - xfree(val); + krb5_xfree(val); return; } diff --git a/src/lib/krb5/free/f_authdata.c b/src/lib/krb5/free/f_authdata.c index 06cdfa2..975ae29 100644 --- a/src/lib/krb5/free/f_authdata.c +++ b/src/lib/krb5/free/f_authdata.c @@ -41,9 +41,9 @@ krb5_authdata **val; for (temp = val; *temp; temp++) { if ((*temp)->contents) - xfree((*temp)->contents); - xfree(*temp); + krb5_xfree((*temp)->contents); + krb5_xfree(*temp); } - xfree(val); + krb5_xfree(val); return; } diff --git a/src/lib/krb5/free/f_authent.c b/src/lib/krb5/free/f_authent.c index 4e399b5..07e27fa 100644 --- a/src/lib/krb5/free/f_authent.c +++ b/src/lib/krb5/free/f_authent.c @@ -46,6 +46,6 @@ krb5_authenticator *val; krb5_free_keyblock(val->subkey); if (val->authorization_data) krb5_free_authdata(val->authorization_data); - xfree(val); + krb5_xfree(val); return; } diff --git a/src/lib/krb5/free/f_cksum.c b/src/lib/krb5/free/f_cksum.c index d293c96..9cbd5ed 100644 --- a/src/lib/krb5/free/f_cksum.c +++ b/src/lib/krb5/free/f_cksum.c @@ -38,7 +38,7 @@ krb5_free_checksum(val) register krb5_checksum *val; { if (val->contents) - xfree(val->contents); - xfree(val); + krb5_xfree(val->contents); + krb5_xfree(val); return; } diff --git a/src/lib/krb5/free/f_cred.c b/src/lib/krb5/free/f_cred.c index b640176..3e32878 100644 --- a/src/lib/krb5/free/f_cred.c +++ b/src/lib/krb5/free/f_cred.c @@ -40,7 +40,7 @@ register krb5_cred *val; if (val->tickets) krb5_free_tickets(val->tickets); if (val->enc_part.ciphertext.data) - xfree(val->enc_part.ciphertext.data); - xfree(val); + krb5_xfree(val->enc_part.ciphertext.data); + krb5_xfree(val); return; } diff --git a/src/lib/krb5/free/f_cred_cnt.c b/src/lib/krb5/free/f_cred_cnt.c index e5b73b9..4a3b506 100644 --- a/src/lib/krb5/free/f_cred_cnt.c +++ b/src/lib/krb5/free/f_cred_cnt.c @@ -48,12 +48,12 @@ krb5_creds *val; krb5_free_principal(val->server); if (val->keyblock.contents) { memset((char *)val->keyblock.contents, 0, val->keyblock.length); - xfree(val->keyblock.contents); + krb5_xfree(val->keyblock.contents); } if (val->ticket.data) - xfree(val->ticket.data); + krb5_xfree(val->ticket.data); if (val->second_ticket.data) - xfree(val->second_ticket.data); + krb5_xfree(val->second_ticket.data); if (val->addresses) krb5_free_addresses(val->addresses); if (val->authdata) diff --git a/src/lib/krb5/free/f_cred_enc.c b/src/lib/krb5/free/f_cred_enc.c index 46a3df1..5ca6102 100644 --- a/src/lib/krb5/free/f_cred_enc.c +++ b/src/lib/krb5/free/f_cred_enc.c @@ -53,8 +53,8 @@ register krb5_cred_enc_part *val; krb5_free_principal((*temp)->server); if ((*temp)->caddrs) krb5_free_addresses((*temp)->caddrs); - xfree((*temp)); + krb5_xfree((*temp)); } - xfree(val); + krb5_xfree(val); return; } diff --git a/src/lib/krb5/free/f_creds.c b/src/lib/krb5/free/f_creds.c index 9b5a5e5..5fcbc91 100644 --- a/src/lib/krb5/free/f_creds.c +++ b/src/lib/krb5/free/f_creds.c @@ -38,6 +38,6 @@ krb5_free_creds(val) krb5_creds *val; { krb5_free_cred_contents(val); - xfree(val); + krb5_xfree(val); return; } diff --git a/src/lib/krb5/free/f_enc_kdc.c b/src/lib/krb5/free/f_enc_kdc.c index 28fda6c..a5ed623 100644 --- a/src/lib/krb5/free/f_enc_kdc.c +++ b/src/lib/krb5/free/f_enc_kdc.c @@ -45,6 +45,6 @@ register krb5_enc_kdc_rep_part *val; krb5_free_principal(val->server); if (val->caddrs) krb5_free_addresses(val->caddrs); - xfree(val); + krb5_xfree(val); return; } diff --git a/src/lib/krb5/free/f_enc_tkt.c b/src/lib/krb5/free/f_enc_tkt.c index 9a38270..c0fdcd9 100644 --- a/src/lib/krb5/free/f_enc_tkt.c +++ b/src/lib/krb5/free/f_enc_tkt.c @@ -42,11 +42,11 @@ krb5_enc_tkt_part *val; if (val->client) krb5_free_principal(val->client); if (val->transited.tr_contents.data) - xfree(val->transited.tr_contents.data); + krb5_xfree(val->transited.tr_contents.data); if (val->caddrs) krb5_free_addresses(val->caddrs); if (val->authorization_data) krb5_free_authdata(val->authorization_data); - xfree(val); + krb5_xfree(val); return; } diff --git a/src/lib/krb5/free/f_error.c b/src/lib/krb5/free/f_error.c index 219412e..4cb7d85 100644 --- a/src/lib/krb5/free/f_error.c +++ b/src/lib/krb5/free/f_error.c @@ -42,9 +42,9 @@ register krb5_error *val; if (val->server) krb5_free_principal(val->server); if (val->text.data) - xfree(val->text.data); + krb5_xfree(val->text.data); if (val->e_data.data) - xfree(val->e_data.data); - xfree(val); + krb5_xfree(val->e_data.data); + krb5_xfree(val); return; } diff --git a/src/lib/krb5/free/f_kdc_rep.c b/src/lib/krb5/free/f_kdc_rep.c index b4a8bf8..19791c9 100644 --- a/src/lib/krb5/free/f_kdc_rep.c +++ b/src/lib/krb5/free/f_kdc_rep.c @@ -44,9 +44,9 @@ krb5_kdc_rep *val; if (val->ticket) krb5_free_ticket(val->ticket); if (val->enc_part.ciphertext.data) - xfree(val->enc_part.ciphertext.data); + krb5_xfree(val->enc_part.ciphertext.data); if (val->enc_part2) krb5_free_enc_kdc_rep_part(val->enc_part2); - xfree(val); + krb5_xfree(val); return; } diff --git a/src/lib/krb5/free/f_kdc_req.c b/src/lib/krb5/free/f_kdc_req.c index 489fe85..177ef08 100644 --- a/src/lib/krb5/free/f_kdc_req.c +++ b/src/lib/krb5/free/f_kdc_req.c @@ -44,15 +44,15 @@ krb5_kdc_req *val; if (val->server) krb5_free_principal(val->server); if (val->etype) - xfree(val->etype); + krb5_xfree(val->etype); if (val->addresses) krb5_free_addresses(val->addresses); if (val->authorization_data.ciphertext.data) - xfree(val->authorization_data.ciphertext.data); + krb5_xfree(val->authorization_data.ciphertext.data); if (val->unenc_authdata) krb5_free_authdata(val->unenc_authdata); if (val->second_ticket) krb5_free_tickets(val->second_ticket); - xfree(val); + krb5_xfree(val); return; } diff --git a/src/lib/krb5/free/f_keyblock.c b/src/lib/krb5/free/f_keyblock.c index 14d3953..18dbcc2 100644 --- a/src/lib/krb5/free/f_keyblock.c +++ b/src/lib/krb5/free/f_keyblock.c @@ -39,8 +39,8 @@ register krb5_keyblock *val; { if (val->contents) { memset((char *)val->contents, 0, val->length); - xfree(val->contents); + krb5_xfree(val->contents); } - xfree(val); + krb5_xfree(val); return; } diff --git a/src/lib/krb5/free/f_last_req.c b/src/lib/krb5/free/f_last_req.c index 240cde4..e731d1d 100644 --- a/src/lib/krb5/free/f_last_req.c +++ b/src/lib/krb5/free/f_last_req.c @@ -40,7 +40,7 @@ krb5_last_req_entry **val; register krb5_last_req_entry **temp; for (temp = val; *temp; temp++) - xfree(*temp); - xfree(val); + krb5_xfree(*temp); + krb5_xfree(val); return; } diff --git a/src/lib/krb5/free/f_padata.c b/src/lib/krb5/free/f_padata.c index 86523ac..384fbfb 100644 --- a/src/lib/krb5/free/f_padata.c +++ b/src/lib/krb5/free/f_padata.c @@ -41,9 +41,9 @@ krb5_pa_data **val; for (temp = val; *temp; temp++) { if ((*temp)->contents) - xfree((*temp)->contents); - xfree(*temp); + krb5_xfree((*temp)->contents); + krb5_xfree(*temp); } - xfree(val); + krb5_xfree(val); return; } diff --git a/src/lib/krb5/free/f_princ.c b/src/lib/krb5/free/f_princ.c index 802707e..cf8a933 100644 --- a/src/lib/krb5/free/f_princ.c +++ b/src/lib/krb5/free/f_princ.c @@ -42,10 +42,10 @@ krb5_principal val; if (val->data) { while(--i >= 0) free(krb5_princ_component(val, i)->data); - xfree(val->data); + krb5_xfree(val->data); } if (val->realm.data) - xfree(val->realm.data); - xfree(val); + krb5_xfree(val->realm.data); + krb5_xfree(val); return; } diff --git a/src/lib/krb5/free/f_priv.c b/src/lib/krb5/free/f_priv.c index 28f7e1d..6ad616a 100644 --- a/src/lib/krb5/free/f_priv.c +++ b/src/lib/krb5/free/f_priv.c @@ -38,7 +38,7 @@ krb5_free_priv(val) register krb5_priv *val; { if (val->enc_part.ciphertext.data) - xfree(val->enc_part.ciphertext.data); - xfree(val); + krb5_xfree(val->enc_part.ciphertext.data); + krb5_xfree(val); return; } diff --git a/src/lib/krb5/free/f_priv_enc.c b/src/lib/krb5/free/f_priv_enc.c index 0d65970..a645344 100644 --- a/src/lib/krb5/free/f_priv_enc.c +++ b/src/lib/krb5/free/f_priv_enc.c @@ -38,11 +38,11 @@ krb5_free_priv_enc_part(val) register krb5_priv_enc_part *val; { if (val->user_data.data) - xfree(val->user_data.data); + krb5_xfree(val->user_data.data); if (val->r_address) krb5_free_address(val->r_address); if (val->s_address) krb5_free_address(val->s_address); - xfree(val); + krb5_xfree(val); return; } diff --git a/src/lib/krb5/free/f_pwd_data.c b/src/lib/krb5/free/f_pwd_data.c index 95d1a31..9688101 100644 --- a/src/lib/krb5/free/f_pwd_data.c +++ b/src/lib/krb5/free/f_pwd_data.c @@ -39,6 +39,6 @@ krb5_pwd_data *val; { if (val->element) krb5_free_pwd_sequences(val->element); - xfree(val); + krb5_xfree(val); return; } diff --git a/src/lib/krb5/free/f_pwd_seq.c b/src/lib/krb5/free/f_pwd_seq.c index 65b072c..4f51a7d 100644 --- a/src/lib/krb5/free/f_pwd_seq.c +++ b/src/lib/krb5/free/f_pwd_seq.c @@ -38,8 +38,8 @@ krb5_free_pwd_sequences(val) passwd_phrase_element **val; { if ((*val)->passwd) - xfree((*val)->passwd); + krb5_xfree((*val)->passwd); if ((*val)->phrase) - xfree((*val)->phrase); + krb5_xfree((*val)->phrase); return; } diff --git a/src/lib/krb5/free/f_safe.c b/src/lib/krb5/free/f_safe.c index b884236..b07b789 100644 --- a/src/lib/krb5/free/f_safe.c +++ b/src/lib/krb5/free/f_safe.c @@ -38,13 +38,13 @@ krb5_free_safe(val) register krb5_safe *val; { if (val->user_data.data) - xfree(val->user_data.data); + krb5_xfree(val->user_data.data); if (val->r_address) krb5_free_address(val->r_address); if (val->s_address) krb5_free_address(val->s_address); if (val->checksum) krb5_free_checksum(val->checksum); - xfree(val); + krb5_xfree(val); return; } diff --git a/src/lib/krb5/free/f_tgt_cred.c b/src/lib/krb5/free/f_tgt_cred.c index 3cf91f6..ac363cc 100644 --- a/src/lib/krb5/free/f_tgt_cred.c +++ b/src/lib/krb5/free/f_tgt_cred.c @@ -41,5 +41,5 @@ krb5_creds **tgts; register krb5_creds **tgtpp; for (tgtpp = tgts; *tgtpp; tgtpp++) krb5_free_creds(*tgtpp); - xfree(tgts); + krb5_xfree(tgts); } diff --git a/src/lib/krb5/free/f_ticket.c b/src/lib/krb5/free/f_ticket.c index 839dfb2..8cf3e98 100644 --- a/src/lib/krb5/free/f_ticket.c +++ b/src/lib/krb5/free/f_ticket.c @@ -40,9 +40,9 @@ krb5_ticket *val; if (val->server) krb5_free_principal(val->server); if (val->enc_part.ciphertext.data) - xfree(val->enc_part.ciphertext.data); + krb5_xfree(val->enc_part.ciphertext.data); if (val->enc_part2) krb5_free_enc_tkt_part(val->enc_part2); - xfree(val); + krb5_xfree(val); return; } diff --git a/src/lib/krb5/free/f_tickets.c b/src/lib/krb5/free/f_tickets.c index 6a61d69..f4b768a 100644 --- a/src/lib/krb5/free/f_tickets.c +++ b/src/lib/krb5/free/f_tickets.c @@ -41,6 +41,6 @@ krb5_ticket **val; for (temp = val; *temp; temp++) krb5_free_ticket(*temp); - xfree(val); + krb5_xfree(val); return; } diff --git a/src/lib/krb5/free/f_tkt_auth.c b/src/lib/krb5/free/f_tkt_auth.c index 3152eeb..732892e 100644 --- a/src/lib/krb5/free/f_tkt_auth.c +++ b/src/lib/krb5/free/f_tkt_auth.c @@ -41,6 +41,6 @@ krb5_tkt_authent *val; krb5_free_ticket(val->ticket); if (val->authenticator) krb5_free_authenticator(val->authenticator); - xfree(val); + krb5_xfree(val); return; } |