rename some inline functions from se_ to emem_ prefix as a first step to generalize

teh tree management and to use trees with different storage scope without too much code duplication.

it would be useful with a tree that had indefinite storage instead of the emem functions which commonly have ep or se storage scope.

indefinite storage scope would be useful for example for managing a global and static set of well known guid to name mappings(not yet implemented)    and also for
oid to name mappings.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@18886 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/epan/emem.c b/epan/emem.c
index cedfda900e49c70e64d08a7435b431ea259f983b..e0dac6bf008ba8e183b0620ab737344c11c73f8c 100644 (file)
--- a/epan/emem.c
+++ b/epan/emem.c
@@ -988,32 +988,32 @@ se_tree_lookup32_le(se_tree_t *se_tree, guint32 key)
 
 
 static inline se_tree_node_t *
-se_tree_parent(se_tree_node_t *node)
+emem_tree_parent(se_tree_node_t *node)
 {
        return node->parent;
 }
 
 static inline se_tree_node_t *
-se_tree_grandparent(se_tree_node_t *node)
+emem_tree_grandparent(se_tree_node_t *node)
 {
        se_tree_node_t *parent;
 
-       parent=se_tree_parent(node);
+       parent=emem_tree_parent(node);
        if(parent){
                return parent->parent;
        }
        return NULL;
 }
 static inline se_tree_node_t *
-se_tree_uncle(se_tree_node_t *node)
+emem_tree_uncle(se_tree_node_t *node)
 {
        se_tree_node_t *parent, *grandparent;
 
-       parent=se_tree_parent(node);
+       parent=emem_tree_parent(node);
        if(!parent){
                return NULL;
        }
-       grandparent=se_tree_parent(parent);
+       grandparent=emem_tree_parent(parent);
        if(!grandparent){
                return NULL;
        }
@@ -1074,8 +1074,8 @@ rb_insert_case5(se_tree_t *se_tree, se_tree_node_t *node)
        se_tree_node_t *grandparent;
        se_tree_node_t *parent;
 
-       parent=se_tree_parent(node);
-       grandparent=se_tree_parent(parent);
+       parent=emem_tree_parent(node);
+       grandparent=emem_tree_parent(parent);
        parent->u.rb_color=SE_TREE_RB_COLOR_BLACK;
        grandparent->u.rb_color=SE_TREE_RB_COLOR_RED;
        if( (node==parent->left) && (parent==grandparent->left) ){
@@ -1091,8 +1091,8 @@ rb_insert_case4(se_tree_t *se_tree, se_tree_node_t *node)
        se_tree_node_t *grandparent;
        se_tree_node_t *parent;
 
-       parent=se_tree_parent(node);
-       grandparent=se_tree_parent(parent);
+       parent=emem_tree_parent(node);
+       grandparent=emem_tree_parent(parent);
        if(!grandparent){
                return;
        }
@@ -1113,12 +1113,12 @@ rb_insert_case3(se_tree_t *se_tree, se_tree_node_t *node)
        se_tree_node_t *parent;
        se_tree_node_t *uncle;
 
-       uncle=se_tree_uncle(node);
+       uncle=emem_tree_uncle(node);
        if(uncle && (uncle->u.rb_color==SE_TREE_RB_COLOR_RED)){
-               parent=se_tree_parent(node);
+               parent=emem_tree_parent(node);
                parent->u.rb_color=SE_TREE_RB_COLOR_BLACK;
                uncle->u.rb_color=SE_TREE_RB_COLOR_BLACK;
-               grandparent=se_tree_grandparent(node);
+               grandparent=emem_tree_grandparent(node);
                grandparent->u.rb_color=SE_TREE_RB_COLOR_RED;
                rb_insert_case1(se_tree, grandparent);
        } else {
@@ -1131,7 +1131,7 @@ rb_insert_case2(se_tree_t *se_tree, se_tree_node_t *node)
 {
        se_tree_node_t *parent;
 
-       parent=se_tree_parent(node);
+       parent=emem_tree_parent(node);
        /* parent is always non-NULL here */
        if(parent->u.rb_color==SE_TREE_RB_COLOR_BLACK){
                return;
@@ -1144,7 +1144,7 @@ rb_insert_case1(se_tree_t *se_tree, se_tree_node_t *node)
 {
        se_tree_node_t *parent;
 
-       parent=se_tree_parent(node);
+       parent=emem_tree_parent(node);
        if(!parent){
                node->u.rb_color=SE_TREE_RB_COLOR_BLACK;
                return;