sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-02 00:22:11 +03:00
Code Activity

Remove more usages of global_loadparm.

Browse Source
This commit is contained in:
Jelmer Vernooij
2008-10-24 14:57:03 +02:00
parent 61013deff8
commit 27dce768d3
7 changed files with 50 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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