Changeset 745 for trunk/server/source4/lib/registry/interface.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)
• source4/lib/registry/interface.c (modified) (9 diffs)

trunk/server/source4/lib/registry/interface.c

@@ -45 +45 @@
 _PUBLIC_ const char *reg_get_predef_name(uint32_t hkey)
 {
-        int i;
+        unsigned int i;
         for (i = 0; reg_predefined_keys[i].name; i++) {
                 if (reg_predefined_keys[i].handle == hkey)
@@ -59 +59 @@
                                                struct registry_key **key)
 {
-        int i;
+        unsigned int i;
 
         for (i = 0; reg_predefined_keys[i].name; i++) {
@@ -151 +151 @@
 _PUBLIC_ WERROR reg_key_get_subkey_by_index(TALLOC_CTX *mem_ctx,
                                             const struct registry_key *key,
-                                            int idx, const char **name,
+                                            uint32_t idx, const char **name,
                                             const char **keyclass,
                                             NTTIME *last_changed_time)
@@ -186 +186 @@
  * Delete a key.
  */
-_PUBLIC_ WERROR reg_key_del(struct registry_key *parent, const char *name)
+_PUBLIC_ WERROR reg_key_del(TALLOC_CTX *mem_ctx, struct registry_key *parent,
+                            const char *name)
 {
         if (parent == NULL)
@@ -194 +195 @@
                 return WERR_NOT_SUPPORTED;
 
-        return parent->context->ops->delete_key(parent, name);
+        return parent->context->ops->delete_key(mem_ctx, parent, name);
 }
 
@@ -202 +203 @@
 _PUBLIC_ WERROR reg_key_add_name(TALLOC_CTX *mem_ctx,
                                  struct registry_key *parent,
-                                 const char *name, const char *key_class,
+                                 const char *path, const char *key_class,
                                  struct security_descriptor *desc,
                                  struct registry_key **newkey)
@@ -215 +216 @@
         }
 
-        return parent->context->ops->create_key(mem_ctx, parent, name,
+        return parent->context->ops->create_key(mem_ctx, parent, path,
                                                 key_class, desc, newkey);
 }
@@ -258 +259 @@
  * Delete a value.
  */
-_PUBLIC_ WERROR reg_del_value(struct registry_key *key, const char *valname)
+_PUBLIC_ WERROR reg_del_value(TALLOC_CTX *mem_ctx, struct registry_key *key,
+                              const char *valname)
 {
         if (key == NULL)
@@ -266 +268 @@
                 return WERR_NOT_SUPPORTED;
 
-        return key->context->ops->delete_value(key, valname);
+        return key->context->ops->delete_value(mem_ctx, key, valname);
 }