Changeset 745 for trunk/server/source3/registry/reg_cachehook.c

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source3/registry/reg_cachehook.c (modified) (5 diffs)

trunk/server/source3/registry/reg_cachehook.c

@@ -3 +3 @@
  *  Virtual Windows Registry Layer
  *  Copyright (C) Gerald Carter                     2002.
+ *  Copyright (C) Michael Adam                      2008
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -22 +23 @@
 #include "includes.h"
 #include "adt_tree.h"
+#include "registry.h"
+#include "reg_cachehook.h"
 
 #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 */
 
@@ -41 +44 @@
         if (tmp_path == NULL) {
                 DEBUG(0, ("talloc_asprintf failed!\n"));
-                return WERR_NOMEM;
-        }
-
-        tmp_path = talloc_string_sub(mem_ctx, tmp_path, "\\", "/");
-        if (tmp_path == NULL) {
-                DEBUG(0, ("talloc_string_sub_failed!\n"));
                 return WERR_NOMEM;
         }
@@ -65 +62 @@
         }
 
-        cache_tree = pathtree_init(&regdb_ops, NULL);
+        cache_tree = pathtree_init(&regdb_ops);
         if (cache_tree == NULL) {
                 return WERR_NOMEM;
@@ -77 +74 @@
 /**********************************************************************
  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.
  *********************************************************************/