diff options
| -rw-r--r-- | source3/include/adt_tree.h | 12 | ||||
| -rw-r--r-- | source3/lib/adt_tree.c | 14 | ||||
| -rw-r--r-- | source3/registry/reg_cachehook.c | 4 |
3 files changed, 16 insertions, 14 deletions
diff --git a/source3/include/adt_tree.h b/source3/include/adt_tree.h index 08c7791802..b9f935ebdc 100644 --- a/source3/include/adt_tree.h +++ b/source3/include/adt_tree.h @@ -30,12 +30,12 @@ struct tree_node { void *data_p; }; -typedef struct _tree_root { +struct sorted_tree { struct tree_node *root; /* not used currently (is it needed?) */ int (*compare)(void* x, void *y); -} SORTED_TREE; +}; /* * API @@ -43,19 +43,19 @@ typedef struct _tree_root { /* create a new tree, talloc_free() to throw it away */ -SORTED_TREE* pathtree_init( void *data_p, int (cmp_fn)(void*, void*) ); +struct sorted_tree *pathtree_init( void *data_p, int (cmp_fn)(void*, void*) ); /* add a new path component */ -WERROR pathtree_add( SORTED_TREE *tree, const char *path, void *data_p ); +WERROR pathtree_add(struct sorted_tree *tree, const char *path, void *data_p ); /* search path */ -void* pathtree_find( SORTED_TREE *tree, char *key ); +void *pathtree_find(struct sorted_tree *tree, char *key ); /* debug (print) functions */ -void pathtree_print_keys( SORTED_TREE *tree, int debug ); +void pathtree_print_keys(struct sorted_tree *tree, int debug ); #endif diff --git a/source3/lib/adt_tree.c b/source3/lib/adt_tree.c index bb918a8162..b184394614 100644 --- a/source3/lib/adt_tree.c +++ b/source3/lib/adt_tree.c @@ -50,12 +50,14 @@ static bool trim_tree_keypath( char *path, char **base, char **new_path ) for comparision of two children *************************************************************************/ - SORTED_TREE* pathtree_init( void *data_p, int (cmp_fn)(void*, void*) ) +struct sorted_tree *pathtree_init( void *data_p, int (cmp_fn)(void*, void*) ) { - SORTED_TREE *tree = NULL; + struct sorted_tree *tree = NULL; - if ( !(tree = TALLOC_ZERO_P(NULL, SORTED_TREE)) ) + tree = talloc_zero(NULL, struct sorted_tree); + if (tree == NULL) { return NULL; + } tree->compare = cmp_fn; @@ -196,7 +198,7 @@ static struct tree_node *pathtree_find_child(struct tree_node *node, Add a new node into the tree given a key path and a blob of data *************************************************************************/ - WERROR pathtree_add( SORTED_TREE *tree, const char *path, void *data_p ) +WERROR pathtree_add(struct sorted_tree *tree, const char *path, void *data_p) { char *str, *base, *path2; struct tree_node *current, *next; @@ -324,7 +326,7 @@ static void pathtree_print_children(TALLOC_CTX *ctx, Dump the kys for a tree to the log file *************************************************************************/ - void pathtree_print_keys( SORTED_TREE *tree, int debug ) +void pathtree_print_keys(struct sorted_tree *tree, int debug ) { int i; int num_children = tree->root->num_children; @@ -348,7 +350,7 @@ static void pathtree_print_children(TALLOC_CTX *ctx, the tree *************************************************************************/ - void* pathtree_find( SORTED_TREE *tree, char *key ) +void* pathtree_find(struct sorted_tree *tree, char *key ) { char *keystr, *base = NULL, *str = NULL, *p; struct tree_node *current; diff --git a/source3/registry/reg_cachehook.c b/source3/registry/reg_cachehook.c index 4f84de5286..57097c1ddd 100644 --- a/source3/registry/reg_cachehook.c +++ b/source3/registry/reg_cachehook.c @@ -25,7 +25,7 @@ #undef DBGC_CLASS #define DBGC_CLASS DBGC_REGISTRY -static SORTED_TREE *cache_tree = NULL; +static struct sorted_tree *cache_tree = NULL; extern struct registry_ops regdb_ops; /* these are the default */ static WERROR keyname_to_path(TALLOC_CTX *mem_ctx, const char *keyname, @@ -76,7 +76,7 @@ WERROR reghook_cache_init(void) /********************************************************************** Add a new registry hook to the cache. Note that the keyname - is not in the exact format that a SORTED_TREE expects. + is not in the exact format that a struct sorted_tree expects. *********************************************************************/ WERROR reghook_cache_add(const char *keyname, struct registry_ops *ops) |