sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-13 13:18:06 +03:00
Code

r26563: Fix reg_diff_apply argument order.

Browse Source 
(This used to be commit cfffd0357e)
This commit is contained in:
Jelmer Vernooij 2007-12-22 05:02:48 -06:00 committed by Stefan Metzmacher
parent b7ffc3b404
commit 670918f916
4 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source4/lib/registry/patchfile.c
View File

@ -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;

3
source4/lib/registry/patchfile.h
View File

@ -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,

6
source4/lib/registry/registry.i
View File

@ -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);

2
source4/lib/registry/tools/regpatch.c
View File

@ -65,7 +65,7 @@ int main(int argc, char **argv)
poptFreeContext(pc);
reg_diff_apply(patch, h);
reg_diff_apply(h, patch);
return 0;
}