From a512f5779d0e84c3a418055d8fe653f30bcf5601 Mon Sep 17 00:00:00 2001 From: Ken Raeburn Date: Wed, 28 Jan 2009 00:04:15 +0000 Subject: Start to phase out krb5_xfree macro, which just casts its argument to char* and calls free. Replace most uses, outside of the LDAP KDB plugin, which doesn't build on my test system of the moment because of version dependencies. Add one explicit cast to make the change warning-neutral (under gcc 4.0.1 on Mac OS X 10.5.6). git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@21812 dc483132-0cff-0310-8789-dd5450dbe970 --- src/lib/kdb/decrypt_key.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/lib/kdb/decrypt_key.c') diff --git a/src/lib/kdb/decrypt_key.c b/src/lib/kdb/decrypt_key.c index 9ab66dfbf5..a564c37b01 100644 --- a/src/lib/kdb/decrypt_key.c +++ b/src/lib/kdb/decrypt_key.c @@ -90,7 +90,7 @@ krb5_dbekd_def_decrypt_key_data( krb5_context context, if ((retval = krb5_c_decrypt(context, mkey, 0 /* XXX */, 0, &cipher, &plain))) { - krb5_xfree(plain.data); + free(plain.data); return retval; } @@ -101,7 +101,7 @@ krb5_dbekd_def_decrypt_key_data( krb5_context context, any better than that. */ if (tmplen > plain.length) { - krb5_xfree(plain.data); + free(plain.data); return(KRB5_CRYPTO_INTERNAL); } @@ -118,7 +118,7 @@ krb5_dbekd_def_decrypt_key_data( krb5_context context, if ((keysalt->data.length = key_data->key_data_length[1])) { if (!(keysalt->data.data=(char *)malloc(keysalt->data.length))){ if (key_data->key_data_contents[0]) { - krb5_xfree(dbkey->contents); + free(dbkey->contents); dbkey->contents = 0; dbkey->length = 0; } -- cgit