diff options
| author | Evan Huus <eapache@gmail.com> | 2015-06-25 15:23:29 -0700 |
|---|---|---|
| committer | Evan Huus <eapache@gmail.com> | 2015-06-25 22:26:12 +0000 |
| commit | d81ba670a16caa8d89482f336348dba0db5a6943 (patch) | |
| tree | 26480d8d073e3ffc2fc356cf30d75f34bac582e5 /epan/wmem/wmem_tree.c | |
| parent | acbbce9ffbec7078e832cf4d780fdcc464ea2c7d (diff) | |
| download | wireshark-d81ba670a16caa8d89482f336348dba0db5a6943.tar.gz | |
wmem: bubble up key type change another function
Follow-up to gb679e2a.
Change-Id: I6cc168c3f3a6e1c8ce7bfa9344255acd3c8a7d20
Reviewed-on: https://code.wireshark.org/review/9164
Reviewed-by: Evan Huus <eapache@gmail.com>
Diffstat (limited to 'epan/wmem/wmem_tree.c')
| -rw-r--r-- | epan/wmem/wmem_tree.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/epan/wmem/wmem_tree.c b/epan/wmem/wmem_tree.c index a3191f5ac6..3563e871bf 100644 --- a/epan/wmem/wmem_tree.c +++ b/epan/wmem/wmem_tree.c @@ -283,7 +283,7 @@ wmem_tree_is_empty(wmem_tree_t *tree) } static wmem_tree_node_t * -create_node(wmem_allocator_t *allocator, wmem_tree_node_t *parent, guint32 key, +create_node(wmem_allocator_t *allocator, wmem_tree_node_t *parent, void *key, void *data, wmem_node_color_t color, gboolean is_subtree) { wmem_tree_node_t *node; @@ -294,7 +294,7 @@ create_node(wmem_allocator_t *allocator, wmem_tree_node_t *parent, guint32 key, node->right = NULL; node->parent = parent; - node->key = GUINT_TO_POINTER(key); + node->key = key; node->data = data; node->color = color; @@ -313,7 +313,7 @@ lookup_or_insert32(wmem_tree_t *tree, guint32 key, /* is this the first node ?*/ if (!node) { - new_node = create_node(tree->allocator, NULL, key, + new_node = create_node(tree->allocator, NULL, GUINT_TO_POINTER(key), CREATE_DATA(func, data), WMEM_NODE_COLOR_BLACK, is_subtree); tree->root = new_node; return new_node->data; @@ -336,7 +336,7 @@ lookup_or_insert32(wmem_tree_t *tree, guint32 key, } else { /* new node to the left */ - new_node = create_node(tree->allocator, node, key, + new_node = create_node(tree->allocator, node, GUINT_TO_POINTER(key), CREATE_DATA(func, data), WMEM_NODE_COLOR_RED, is_subtree); node->left = new_node; @@ -348,7 +348,7 @@ lookup_or_insert32(wmem_tree_t *tree, guint32 key, } else { /* new node to the right */ - new_node = create_node(tree->allocator, node, key, + new_node = create_node(tree->allocator, node, GUINT_TO_POINTER(key), CREATE_DATA(func, data), WMEM_NODE_COLOR_RED, is_subtree); node->right = new_node; |