diff options
| author | Gerald Carter <jerry@samba.org> | 2005-02-25 14:08:30 +0000 |
|---|---|---|
| committer | Gerald Carter <jerry@samba.org> | 2005-02-25 14:08:30 +0000 |
| commit | 70cd25be8b07743816b9376f9d219453f0f906fc (patch) | |
| tree | 073f3d33dac8c96b0d4c7b809b3dc86b91023214 /source/registry | |
| parent | 1d58e0d7811acc335f09128ae757f5f76a51644d (diff) | |
| download | samba-70cd25be8b07743816b9376f9d219453f0f906fc.tar.gz | |
r5555: current with 3.0 tree as of r5548; getting ready for 3.0.12pre1
Diffstat (limited to 'source/registry')
| -rw-r--r-- | source/registry/reg_cachehook.c | 9 | ||||
| -rw-r--r-- | source/registry/reg_objects.c | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/source/registry/reg_cachehook.c b/source/registry/reg_cachehook.c index 3b75cae1a59..dc7136a1d53 100644 --- a/source/registry/reg_cachehook.c +++ b/source/registry/reg_cachehook.c @@ -21,6 +21,7 @@ /* Implementation of registry hook cache tree */ #include "includes.h" +#include "adt_tree.h" #undef DBGC_CLASS #define DBGC_CLASS DBGC_RPC_SRV @@ -35,7 +36,7 @@ static REGISTRY_HOOK default_hook = { KEY_TREE_ROOT, ®db_ops }; BOOL reghook_cache_init( void ) { - cache_tree = sorted_tree_init( &default_hook, NULL, NULL ); + cache_tree = pathtree_init( &default_hook, NULL, NULL ); return ( cache_tree == NULL ); } @@ -59,7 +60,7 @@ BOOL reghook_cache_add( REGISTRY_HOOK *hook ) DEBUG(10,("reghook_cache_add: Adding key [%s]\n", key)); - return sorted_tree_add( cache_tree, key, hook ); + return pathtree_add( cache_tree, key, hook ); } /********************************************************************** @@ -93,7 +94,7 @@ REGISTRY_HOOK* reghook_cache_find( char *keyname ) DEBUG(10,("reghook_cache_find: Searching for keyname [%s]\n", key)); - hook = sorted_tree_find( cache_tree, key ) ; + hook = pathtree_find( cache_tree, key ) ; SAFE_FREE( key ); @@ -108,5 +109,5 @@ void reghook_dump_cache( int debuglevel ) { DEBUG(debuglevel,("reghook_dump_cache: Starting cache dump now...\n")); - sorted_tree_print_keys( cache_tree, debuglevel ); + pathtree_print_keys( cache_tree, debuglevel ); } diff --git a/source/registry/reg_objects.c b/source/registry/reg_objects.c index 16fb7dd18d7..c8dc6330873 100644 --- a/source/registry/reg_objects.c +++ b/source/registry/reg_objects.c @@ -113,7 +113,7 @@ void regsubkey_ctr_destroy( REGSUBKEY_CTR *ctr ) void regval_ctr_init( REGVAL_CTR *ctr ) { - if ( !ctr->ctx ) + if ( ctr && !ctr->ctx ) ctr->ctx = talloc_init("regval_ctr_init for ctr %p", ctr); } |