diff options
| author | Evan Huus <eapache@gmail.com> | 2013-09-04 21:14:55 +0000 |
|---|---|---|
| committer | Evan Huus <eapache@gmail.com> | 2013-09-04 21:14:55 +0000 |
| commit | cad50146e3cf9855525c3712b4c05a0b198afc94 (patch) | |
| tree | 7d652ddd2c06bb596e7fe8c85508fde924df1e7b /epan/oids.c | |
| parent | 90ac3f129fc51e2a2a12ae3f42fd1009e3735f1b (diff) | |
Remove what appear to be the last two instances of pe_tree. Could this be the
first emem API to die?
svn path=/trunk/; revision=51756
Diffstat (limited to 'epan/oids.c')
| -rw-r--r-- | epan/oids.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/epan/oids.c b/epan/oids.c index 43644ac4b1..06111b5054 100644 --- a/epan/oids.c +++ b/epan/oids.c @@ -98,7 +98,7 @@ static oid_info_t* add_oid(const char* name, oid_kind_t kind, const oid_value_ty debuglevel = debug_env ? (int)strtoul(debug_env,NULL,10) : 0; - oid_root.children = pe_tree_create(EMEM_TREE_TYPE_RED_BLACK,"oid_root"); + oid_root.children = wmem_tree_new(wmem_epan_scope()); /* * make sure we got strings at least in the three root-children oids @@ -112,7 +112,7 @@ static oid_info_t* add_oid(const char* name, oid_kind_t kind, const oid_value_ty oid_len--; do { - oid_info_t* n = (oid_info_t *)emem_tree_lookup32((emem_tree_t *)c->children,subids[i]); + oid_info_t* n = (oid_info_t *)wmem_tree_lookup32(c->children,subids[i]); if(n) { if (i == oid_len) { @@ -142,13 +142,13 @@ static oid_info_t* add_oid(const char* name, oid_kind_t kind, const oid_value_ty n = (oid_info_t *)g_malloc(sizeof(oid_info_t)); n->subid = subids[i]; n->kind = kind; - n->children = pe_tree_create(EMEM_TREE_TYPE_RED_BLACK,"oid_children"); + n->children = wmem_tree_new(wmem_epan_scope()); n->value_hfid = -2; n->key = key; n->parent = c; n->bits = NULL; - emem_tree_insert32((emem_tree_t *)c->children,n->subid,n); + wmem_tree_insert32(c->children,n->subid,n); if (i == oid_len) { n->name = g_strdup(name); @@ -995,7 +995,7 @@ oid_info_t* oid_get(guint len, guint32* subids, guint* matched, guint* left) { } for( i=0; i < len; i++) { - oid_info_t* next_oid = (oid_info_t *)emem_tree_lookup32((emem_tree_t *)curr_oid->children,subids[i]); + oid_info_t* next_oid = (oid_info_t *)wmem_tree_lookup32(curr_oid->children,subids[i]); if (next_oid) { curr_oid = next_oid; } else { |