diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-10-24 14:57:03 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-10-24 14:57:03 +0200 |
| commit | 27dce768d3801409a734f24765ea92e67ffbd014 (patch) | |
| tree | b55ed17bb224df5396d6ec930e54c34506f8f04b /source4/lib/registry/patchfile.c | |
| parent | 61013deff80dbe3a3dfaa7b5060609500f1f63fa (diff) | |
| download | samba-27dce768d3801409a734f24765ea92e67ffbd014.tar.gz samba-27dce768d3801409a734f24765ea92e67ffbd014.tar.bz2 samba-27dce768d3801409a734f24765ea92e67ffbd014.zip | |
Remove more usages of global_loadparm.
Diffstat (limited to 'source4/lib/registry/patchfile.c')
| -rw-r--r-- | source4/lib/registry/patchfile.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source4/lib/registry/patchfile.c b/source4/lib/registry/patchfile.c index a6f947ee78..06db3b36ba 100644 --- a/source4/lib/registry/patchfile.c +++ b/source4/lib/registry/patchfile.c @@ -479,7 +479,9 @@ 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(struct registry_context *ctx, const char *filename) +_PUBLIC_ WERROR reg_diff_apply(struct registry_context *ctx, + struct smb_iconv_convenience *iconv_convenience, + const char *filename) { struct reg_diff_callbacks callbacks; @@ -490,6 +492,6 @@ _PUBLIC_ WERROR reg_diff_apply(struct registry_context *ctx, const char *filenam callbacks.del_all_values = reg_diff_apply_del_all_values; callbacks.done = NULL; - return reg_diff_load(filename, lp_iconv_convenience(global_loadparm), + return reg_diff_load(filename, iconv_convenience, &callbacks, ctx); } |