osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Remove some emem functions that have now been completely replaced by wmem. 

Finally...

svn path=/trunk/; revision=51757
This commit is contained in:
Evan Huus 2013-09-04 21:24:51 +00:00
parent cad50146e3
commit 14d589a0a7
2 changed files with 0 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
epan/emem.c
View File

@ -1754,41 +1754,6 @@ lookup_or_insert32(emem_tree_t *se_tree, guint32 key, void*(*func)(void*),void*
return node->data;
}
/* When the se data is released, this entire tree will dissapear as if it
* never existed including all metadata associated with the tree.
*/
emem_tree_t *
se_tree_create_non_persistent(int type, const char *name)
{
emem_tree_t *tree_list;
tree_list=(emem_tree_t *)se_alloc(sizeof(emem_tree_t));
tree_list->next=NULL;
tree_list->type=type;
tree_list->tree=NULL;
tree_list->name=name;
tree_list->malloc=se_alloc;
return tree_list;
}
/* This tree is PErmanent and will never be released
*/
emem_tree_t *
pe_tree_create(int type, const char *name)
{
emem_tree_t *tree_list;
tree_list=g_new(emem_tree_t, 1);
tree_list->next=NULL;
tree_list->type=type;
tree_list->tree=NULL;
tree_list->name=name;
tree_list->malloc=(void *(*)(size_t)) g_malloc;
return tree_list;
}
/* create another (sub)tree using the same memory allocation scope
* as the parent tree.
*/

43
epan/emem.h
View File

@ -247,18 +247,6 @@ typedef struct _emem_tree_t {
WS_DLL_PUBLIC
emem_tree_t *se_tree_create(int type, const char *name) G_GNUC_MALLOC;
/** This function is similar to the se_tree_create() call but with the
* difference that when the se memory is released everything including the
* pointer to the tree itself will be released.
* This tree will not be just reset to zero, it will be completely forgotten
* by the allocator.
* Use this function for when you want to store the pointer to a tree inside
* another structure that is also se allocated so that when the structure is
* released, the tree will be completely released as well.
*/
WS_DLL_PUBLIC
emem_tree_t *se_tree_create_non_persistent(int type, const char *name) G_GNUC_MALLOC;
/** se_tree_insert32
* Insert data into the tree and key it by a 32bit integer value
*/
@ -291,37 +279,6 @@ emem_tree_t *se_tree_create_non_persistent(int type, const char *name) G_GNUC_MA
*/
#define se_tree_lookup32_array_le emem_tree_lookup32_array_le
/** Create a new string based hash table */
#define se_tree_create_string() se_tree_create(SE_TREE_TYPE_RED_BLACK)
/** Insert a new value under a string key */
#define se_tree_insert_string emem_tree_insert_string
/** Lookup the value under a string key */
#define se_tree_lookup_string emem_tree_lookup_string
/** Traverse a tree */
#define se_tree_foreach emem_tree_foreach
/* *******************************************************************
* Tree functions for PE memory allocation scope
* ******************************************************************* */
/* These trees have PErmanent allocation scope and will never be released
*/
WS_DLL_PUBLIC
emem_tree_t *pe_tree_create(int type, const char *name) G_GNUC_MALLOC;
#define pe_tree_insert32 emem_tree_insert32
#define pe_tree_lookup32 emem_tree_lookup32
#define pe_tree_lookup32_le emem_tree_lookup32_le
#define pe_tree_insert32_array emem_tree_insert32_array
#define pe_tree_lookup32_array emem_tree_lookup32_array
#define pe_tree_insert_string emem_tree_insert_string
#define pe_tree_lookup_string emem_tree_lookup_string
#define pe_tree_foreach emem_tree_foreach
/* ******************************************************************
* Real tree functions
* ****************************************************************** */