r26563: Fix reg_diff_apply argument order.

diff --git a/source/lib/registry/patchfile.c b/source/lib/registry/patchfile.c
index e5d9a26618fc24b45ab85b2b8e4a8de69f3f45c6..8a417d5935f32d4496b03ed8b43ab746c0cb938e 100644 (file)
--- a/source/lib/registry/patchfile.c
+++ b/source/lib/registry/patchfile.c
@@ -432,8 +432,7 @@ static WERROR reg_diff_apply_del_all_values(void *_ctx, const char *key_name)
 /**
  * Apply diff to a registry context
  */
-_PUBLIC_ WERROR reg_diff_apply(const char *filename,
-                              struct registry_context *ctx)
+_PUBLIC_ WERROR reg_diff_apply(struct registry_context *ctx, const char *filename)
 {
        struct reg_diff_callbacks callbacks;
 

diff --git a/source/lib/registry/patchfile.h b/source/lib/registry/patchfile.h
index 4c0599b2f3bd8c712289d5177d5eb990e22fb409..08a977d9cdc65d6b9258c4d5990868bcdbe56273 100644 (file)
--- a/source/lib/registry/patchfile.h
+++ b/source/lib/registry/patchfile.h
@@ -36,8 +36,7 @@ struct reg_diff_callbacks {
        WERROR (*done) (void *callback_data);
 };
 
-WERROR reg_diff_apply (const char *filename,
-                      struct registry_context *ctx);
+WERROR reg_diff_apply(struct registry_context *ctx, const char *filename);
 
 WERROR reg_generate_diff(struct registry_context *ctx1,
                         struct registry_context *ctx2,

diff --git a/source/lib/registry/registry.i b/source/lib/registry/registry.i
index 1819e7df80e21d87d63c1aafbc48c271fa93fb29..407599ec0818b5dec62d97398f9786a0fec384e4 100644 (file)
--- a/source/lib/registry/registry.i
+++ b/source/lib/registry/registry.i
@@ -97,11 +97,7 @@ typedef struct registry_context {
                                       struct registry_key **key);
 
     WERROR get_predefined_key(uint32_t hkey_id, struct registry_key **key);
-    WERROR apply_patchfile(const char *filename)
-    {
-        return reg_diff_apply(filename, $self);
-    }
-
+    WERROR apply_patchfile(const char *filename);
     WERROR mount_hive(struct hive_key *hive_key, uint32_t hkey_id,
                       const char **elements=NULL);
 

diff --git a/source/lib/registry/tools/regpatch.c b/source/lib/registry/tools/regpatch.c
index ddbedce18a0ff12d1dcdc85512cae04225678443..71837d180791d926f2ce00c804293842bde4e371 100644 (file)
--- a/source/lib/registry/tools/regpatch.c
+++ b/source/lib/registry/tools/regpatch.c
@@ -65,7 +65,7 @@ int main(int argc, char **argv)
 
        poptFreeContext(pc);
 
-       reg_diff_apply(patch, h);
+       reg_diff_apply(h, patch);
 
        return 0;
 }