kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-30 02:26:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

hashtab: Use ast_free.

Browse Source 
A few places in hashtab use free instead of ast_free, remove declaration
of ASTMM_LIBC from hashtab.c as it's no longer needed.

Change-Id: I2ff089bad71640c03c3ce97f1b00fc962ef79427
This commit is contained in:
Corey Farrell
2017-10-07 13:14:08 -04:00
parent 8b719a3e48
commit 841ac3ded6
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
main/hashtab.c
View File

@@ -26,7 +26,6 @@
<support_level>core</support_level> <support_level>core</support_level>
***/ ***/
#define ASTMM_LIBC ASTMM_REDIRECT
#include "asterisk.h" #include "asterisk.h"
#include <ctype.h> #include <ctype.h>
@@ -292,7 +291,7 @@ struct ast_hashtab *ast_hashtab_dup(struct ast_hashtab *tab, void *(*obj_dup_fun
ast_calloc(tab->hash_tab_size, sizeof(*(ht->array))) ast_calloc(tab->hash_tab_size, sizeof(*(ht->array)))
#endif #endif
)) { )) {
free(ht); ast_free(ht);
return NULL; return NULL;
} }
@@ -408,20 +407,20 @@ void ast_hashtab_destroy(struct ast_hashtab *tab, void (*objdestroyfunc)(void *o
} }
tlist_del_item(&(tab->tlist), tab->tlist); tlist_del_item(&(tab->tlist), tab->tlist);
free(t); ast_free(t);
} }
for (i = 0; i < tab->hash_tab_size; i++) { for (i = 0; i < tab->hash_tab_size; i++) {
/* Not totally necessary, but best to destroy old pointers */ /* Not totally necessary, but best to destroy old pointers */
tab->array[i] = NULL; tab->array[i] = NULL;
} }
free(tab->array); ast_free(tab->array);
} }
if (tab->do_locking) { if (tab->do_locking) {
ast_rwlock_unlock(&tab->lock); ast_rwlock_unlock(&tab->lock);
ast_rwlock_destroy(&tab->lock); ast_rwlock_destroy(&tab->lock);
} }
free(tab); ast_free(tab);
} }
} }
@@ -656,7 +655,7 @@ static void ast_hashtab_resize(struct ast_hashtab *tab)
why leave ptrs laying around */ why leave ptrs laying around */
tab->array[i] = 0; /* erase old ptrs */ tab->array[i] = 0; /* erase old ptrs */
} }
free(tab->array); ast_free(tab->array);
if (!(tab->array = if (!(tab->array =
#ifdef __AST_DEBUG_MALLOC #ifdef __AST_DEBUG_MALLOC
__ast_calloc(newsize, sizeof(*(tab->array)), file, lineno, func) __ast_calloc(newsize, sizeof(*(tab->array)), file, lineno, func)
@@ -748,7 +747,7 @@ void ast_hashtab_end_traversal(struct ast_hashtab_iter *it)
return; return;
if (it->tab->do_locking) if (it->tab->do_locking)
ast_rwlock_unlock(&it->tab->lock); ast_rwlock_unlock(&it->tab->lock);
free(it); ast_free(it);
} }
void *ast_hashtab_next(struct ast_hashtab_iter *it) void *ast_hashtab_next(struct ast_hashtab_iter *it)
@@ -781,7 +780,7 @@ static void *ast_hashtab_remove_object_internal(struct ast_hashtab *tab, struct
obj2 = b->object; obj2 = b->object;
b->object = b->next = (void*)2; b->object = b->next = (void*)2;
free(b); /* free up the hashbucket */ ast_free(b); /* free up the hashbucket */
tab->hash_tab_elements--; tab->hash_tab_elements--;
#ifdef DEBUG #ifdef DEBUG
{ {