Rename cfree to rad_cfree

diff --git a/src/include/radiusd.h b/src/include/radiusd.h
index 022b48b58fe5cbe295efa108242ebf2a71cede64..c0ec50ff7c48f23ee9fe13d8c5ad8268dd7ca56d 100644 (file)
--- a/src/include/radiusd.h
+++ b/src/include/radiusd.h
@@ -541,7 +541,7 @@ int         rad_mkdir(char *directory, int mode);
 int            rad_checkfilename(const char *filename);
 void           *rad_malloc(size_t size); /* calls exit(1) on error! */
 void           *rad_calloc(size_t size); /* calls exit(1) on error! */
-void           cfree(const void *ptr);
+void           rad_cfree(const void *ptr);
 REQUEST                *request_alloc(void);
 REQUEST                *request_alloc_fake(REQUEST *oldreq);
 REQUEST                *request_alloc_coa(REQUEST *request);

diff --git a/src/main/util.c b/src/main/util.c
index 7ccca0c902dd4b8787c5d18aad5a9fe9d3104c35..fbf862e998f79367dc7258149169a440619cc6ca 100644 (file)
--- a/src/main/util.c
+++ b/src/main/util.c
@@ -366,7 +366,7 @@ void *rad_calloc(size_t size)
  *     Signature for free is dumb, and raises errors when we try
  *     to free const ptrs.
  */
-void cfree(const void *ptr)
+void rad_cfree(const void *ptr)
 {
        void *tmp;
        if (!ptr) return;

diff --git a/src/main/valuepair.c b/src/main/valuepair.c
index a6167db02a47678d8a43165e479df763ba627bc1..43415db3a8f986c1f81e98ba6d38575f74747344 100644 (file)
--- a/src/main/valuepair.c
+++ b/src/main/valuepair.c
@@ -1062,7 +1062,7 @@ void radius_tmplfree(VALUE_PAIR_TMPL **tmpl)
        if (*tmpl == NULL) return;
        
        if ((*tmpl)->name) {
-               cfree((*tmpl)->name);
+               rad_cfree((*tmpl)->name);
        }
        
        free(*tmpl);

diff --git a/src/modules/rlm_cache/rlm_cache.c b/src/modules/rlm_cache/rlm_cache.c
index 91f0b7d580c0b0159374e68fa98f41228aa918db..3c87112745fb836f83c1ad4f1bed1da61a0b8ac1 100644 (file)
--- a/src/modules/rlm_cache/rlm_cache.c
+++ b/src/modules/rlm_cache/rlm_cache.c
@@ -84,7 +84,7 @@ static void cache_entry_free(void *data)
 {
        rlm_cache_entry_t *c = data;
 
-       cfree(c->key);
+       rad_cfree(c->key);
        pairfree(&c->control);
        pairfree(&c->request);
        pairfree(&c->reply);
@@ -467,7 +467,7 @@ static int cache_detach(void *instance)
        rlm_cache_t *inst = instance;
 
        free(inst->key);
-       cfree(inst->xlat_name);
+       rad_cfree(inst->xlat_name);
 
        fr_heap_delete(inst->heap);
        rbtree_free(inst->cache);

diff --git a/src/modules/rlm_ldap/rlm_ldap.c b/src/modules/rlm_ldap/rlm_ldap.c
index 6e26fd7dd4427b2893dd1727892be1fe68f5cdd5..6b782c5462195252010bdaf833394ecafe3f2829 100644 (file)
--- a/src/modules/rlm_ldap/rlm_ldap.c
+++ b/src/modules/rlm_ldap/rlm_ldap.c
@@ -1645,7 +1645,7 @@ static void xlat_attrsfree(const xlat_attrs_t *expanded)
                if (!name) return;
                
                if (map->src->do_xlat) {
-                       cfree(name);
+                       rad_cfree(name);
                }
        }
 }

diff --git a/src/modules/rlm_policy/rlm_policy.c b/src/modules/rlm_policy/rlm_policy.c
index d34482241b32249adbff4ed557d7d3f2fe68c45b..f092ad18a20c9c4e66dd7656e0bddbd678336750 100644 (file)
--- a/src/modules/rlm_policy/rlm_policy.c
+++ b/src/modules/rlm_policy/rlm_policy.c
@@ -277,7 +277,7 @@ void rlm_policy_free_item(policy_item_t *item)
 
                                this = (policy_named_t *) item;
                                rad_assert(this->name != NULL);
-                               cfree(this->name);
+                               rad_cfree(this->name);
                                rlm_policy_free_item(this->policy);
                        }
                        break;
@@ -287,7 +287,7 @@ void rlm_policy_free_item(policy_item_t *item)
                                policy_call_t *this;
 
                                this = (policy_call_t *) item;
-                               cfree(this->name);
+                               rad_cfree(this->name);
                        }
                        break;
 

diff --git a/src/modules/rlm_sql/rlm_sql.c b/src/modules/rlm_sql/rlm_sql.c
index 3cca8b3dd7dd7a886c6386ca988cfdb3ccae592b..782c5c0ca575b10951149f09cc1faaef39ba4fc1 100644 (file)
--- a/src/modules/rlm_sql/rlm_sql.c
+++ b/src/modules/rlm_sql/rlm_sql.c
@@ -769,7 +769,7 @@ static int rlm_sql_detach(void *instance)
 
                if (inst->config->xlat_name) {
                        xlat_unregister(inst->config->xlat_name, sql_xlat, instance);
-                       cfree(inst->config->xlat_name);
+                       rad_cfree(inst->config->xlat_name);
                }
 
                /*