summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2007-12-22 05:02:48 -0600
committerStefan Metzmacher <metze@samba.org>2007-12-24 01:51:01 -0600
commit670918f916cb881d4cc591516c70bafe4e39ba45 (patch)
treeb9c7725aa4c16b66b2380693fd374d670148c77a /source4
parentb7ffc3b404fbe3cf759e743c23e7bdbf75e71286 (diff)
downloadsamba-670918f916cb881d4cc591516c70bafe4e39ba45.tar.gz
samba-670918f916cb881d4cc591516c70bafe4e39ba45.tar.bz2
samba-670918f916cb881d4cc591516c70bafe4e39ba45.zip
r26563: Fix reg_diff_apply argument order.
(This used to be commit cfffd0357ee4c4bb3f3c9adb051eeee1bbac526a)
Diffstat (limited to 'source4')
-rw-r--r--source4/lib/registry/patchfile.c3
-rw-r--r--source4/lib/registry/patchfile.h3
-rw-r--r--source4/lib/registry/registry.i6
-rw-r--r--source4/lib/registry/tools/regpatch.c2
4 files changed, 4 insertions, 10 deletions
diff --git a/source4/lib/registry/patchfile.c b/source4/lib/registry/patchfile.c
index e5d9a26618..8a417d5935 100644
--- a/source4/lib/registry/patchfile.c
+++ b/source4/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/source4/lib/registry/patchfile.h b/source4/lib/registry/patchfile.h
index 4c0599b2f3..08a977d9cd 100644
--- a/source4/lib/registry/patchfile.h
+++ b/source4/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/source4/lib/registry/registry.i b/source4/lib/registry/registry.i
index 1819e7df80..407599ec08 100644
--- a/source4/lib/registry/registry.i
+++ b/source4/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/source4/lib/registry/tools/regpatch.c b/source4/lib/registry/tools/regpatch.c
index ddbedce18a..71837d1807 100644
--- a/source4/lib/registry/tools/regpatch.c
+++ b/source4/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;
}