osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Simplify the tree code slightly - just don't call the transform function 

if it's NULL, meaning we don't need to define an identity callback.

svn path=/trunk/; revision=49962
This commit is contained in:
Evan Huus 2013-06-16 15:17:53 +00:00
parent f4b3cb0917
commit d0fb6aca01
1 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
epan/wmem/wmem_tree.c
View File

@ -282,8 +282,9 @@ lookup_or_insert32(wmem_tree_t *tree, guint32 key, void*(*func)(void*),
/* is this the first node ?*/
if (!node) {
new_node = create_node(tree->allocator, NULL, key, func(data),
WMEM_TREE_RB_COLOR_BLACK, is_subtree);
new_node = create_node(tree->allocator, NULL, key,
func ? func(data) : data, WMEM_TREE_RB_COLOR_BLACK,
is_subtree);
tree->root = new_node;
return new_node->data;
}
@ -296,7 +297,7 @@ lookup_or_insert32(wmem_tree_t *tree, guint32 key, void*(*func)(void*),
* then return it */
if (key == node->key32) {
if (replace) {
node->data = func(data);
node->data = func ? func(data) : data;
}
return node->data;
}
@ -306,8 +307,9 @@ lookup_or_insert32(wmem_tree_t *tree, guint32 key, void*(*func)(void*),
continue;
}
/* new node to the left */
new_node = create_node(tree->allocator, node, key, func(data),
WMEM_TREE_RB_COLOR_RED, is_subtree);
new_node = create_node(tree->allocator, node, key,
func ? func(data) : data, WMEM_TREE_RB_COLOR_RED,
is_subtree);
node->left = new_node;
break;
}
@ -317,8 +319,9 @@ lookup_or_insert32(wmem_tree_t *tree, guint32 key, void*(*func)(void*),
continue;
}
/* new node to the left */
new_node = create_node(tree->allocator, node, key, func(data),
WMEM_TREE_RB_COLOR_RED, is_subtree);
new_node = create_node(tree->allocator, node, key,
func ? func(data) : data, WMEM_TREE_RB_COLOR_RED,
is_subtree);
node->right = new_node;
break;
}
@ -329,16 +332,10 @@ lookup_or_insert32(wmem_tree_t *tree, guint32 key, void*(*func)(void*),
return node->data;
}
static void *
identity(void *in)
{
return in;
}
void
wmem_tree_insert32(wmem_tree_t *tree, guint32 key, void *data)
{
lookup_or_insert32(tree, key, &identity, data,
lookup_or_insert32(tree, key, NULL, data,
WMEM_TREE_NODE_IS_DATA, TRUE);
}