Get rid of casts of free() argument to char*, except where it's

casting away const (so as to make this change warning-neutral), and in
unicode source (which we may want to keep in sync with another
source), and krb5_xfree macro (to be handled separately).

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@21870 dc483132-0cff-0310-8789-dd5450dbe970

3 files changed, 11 insertions, 16 deletions

diff --git a/src/lib/krb5/rcache/rc_base.c b/src/lib/krb5/rcache/rc_base.c
index ad69282a4..ea532b3d7 100644
--- a/src/lib/krb5/rcache/rc_base.c
+++ b/src/lib/krb5/rcache/rc_base.c
@@ -15,8 +15,6 @@
 #include "rc-int.h"
 #include "k5-thread.h"
 
-#define FREE(x) ((void) free((char *) (x)))
-
 struct krb5_rc_typelist {
     const krb5_rc_ops *ops;
     struct krb5_rc_typelist *next;
@@ -119,13 +117,13 @@ krb5_rc_default(krb5_context context, krb5_rcache *id)
 
     if ((retval = krb5_rc_resolve_type(context, id,
                                        krb5_rc_default_type(context)))) {
-        FREE(*id);
+        free(*id);
         return retval;
     }
     if ((retval = krb5_rc_resolve(context, *id,
                                   krb5_rc_default_name(context)))) {
         k5_mutex_destroy(&(*id)->lock);
-        FREE(*id);
+        free(*id);
         return retval;
     }
     (*id)->magic = KV5M_RCACHE;
@@ -154,19 +152,19 @@ krb5_error_code krb5_rc_resolve_full(krb5_context context, krb5_rcache *idptr,
     type[residual - string_name] = '\0';
 
     if (!(id = (krb5_rcache) malloc(sizeof(*id)))) {
-        FREE(type);
+        free(type);
         return KRB5_RC_MALLOC;
     }
 
     if ((retval = krb5_rc_resolve_type(context, &id,type))) {
-        FREE(type);
-        FREE(id);
+        free(type);
+        free(id);
         return retval;
     }
-    FREE(type);
+    free(type);
     if ((retval = krb5_rc_resolve(context, id,residual + 1))) {
         k5_mutex_destroy(&id->lock);
-        FREE(id);
+        free(id);
         return retval;
     }
     id->magic = KV5M_RCACHE;
diff --git a/src/lib/krb5/rcache/rc_conv.c b/src/lib/krb5/rcache/rc_conv.c
index 3370f45df..2684929a6 100644
--- a/src/lib/krb5/rcache/rc_conv.c
+++ b/src/lib/krb5/rcache/rc_conv.c
@@ -11,8 +11,6 @@
  * An implementation for the default replay cache type.
  */
 
-#define FREE(x) ((void) free((char *) (x)))
-
 #include "rc_base.h"
 
 /*
@@ -31,7 +29,7 @@ krb5_auth_to_rep(krb5_context context, krb5_tkt_authent *auth, krb5_donot_replay
         return retval; /* shouldn't happen */
     if ((retval = krb5_unparse_name(context, auth->authenticator->client,
                                     &rep->client))) {
-        FREE(rep->server);
+        free(rep->server);
         return retval; /* shouldn't happen. */
     }
     return 0;
diff --git a/src/lib/krb5/rcache/rc_io.c b/src/lib/krb5/rcache/rc_io.c
index 82b56297b..683e1a907 100644
--- a/src/lib/krb5/rcache/rc_io.c
+++ b/src/lib/krb5/rcache/rc_io.c
@@ -40,7 +40,6 @@
 #error find some way to use net-byte-order file version numbers.
 #endif
 
-#define FREE(x) ((void) free((char *) (x)))
 #define UNIQUE getpid() /* hopefully unique number */
 
 #define GETDIR (dir = getdir(), dirlen = strlen(dir) + sizeof(PATH_SEPARATOR) - 1)
@@ -205,7 +204,7 @@ cleanup:
         if (d->fn) {
             if (!do_not_unlink)
                 (void) unlink(d->fn);
-            FREE(d->fn);
+            free(d->fn);
             d->fn = NULL;
         }
         if (d->fd != -1) {
@@ -299,7 +298,7 @@ cleanup:
         if (d->fn) {
             if (!do_not_unlink)
                 (void) unlink(d->fn);
-            FREE(d->fn);
+            free(d->fn);
             d->fn = NULL;
         }
         if (d->fd >= 0)
@@ -470,7 +469,7 @@ krb5_error_code
 krb5_rc_io_close(krb5_context context, krb5_rc_iostuff *d)
 {
     if (d->fn != NULL) {
-        FREE(d->fn);
+        free(d->fn);
         d->fn = NULL;
     }
     if (d->fd != -1) {