diff options
| author | Jeremy Allison <jra@samba.org> | 2017-04-11 15:31:17 -0700 |
|---|---|---|
| committer | Andreas Schneider <asn@cryptomilk.org> | 2017-04-18 11:47:17 +0200 |
| commit | 3afbdb7a0e5c5e4bacc40f80ad0e8981b0af4b88 (patch) | |
| tree | 4bfcf8f3eda393f97bb3ec997874a5c9d8616203 /lib/param | |
| parent | 05d83ccf7a6fecf963fcb980acd50cebfc0c3ea9 (diff) | |
| download | samba-3afbdb7a0e5c5e4bacc40f80ad0e8981b0af4b88.tar.gz | |
lib: Remove smb_iconv_handle_reinit_lp()
It's merely a wrapper for smb_iconv_handle_reinit(),
only used in one place and smb_iconv_handle_reinit()
is already called from lib/param/loadparm.c.
Removing this will make it easier to make global_iconv_handle
private state to lib/util/charset/codepoints.c later.
Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
Diffstat (limited to 'lib/param')
| -rw-r--r-- | lib/param/loadparm.c | 9 | ||||
| -rw-r--r-- | lib/param/param.h | 4 | ||||
| -rw-r--r-- | lib/param/util.c | 11 |
3 files changed, 7 insertions, 17 deletions
diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c index 4d21d88cc6c..5f9d52b2bd7 100644 --- a/lib/param/loadparm.c +++ b/lib/param/loadparm.c @@ -1265,7 +1265,8 @@ bool handle_charset(struct loadparm_context *lp_ctx, struct loadparm_service *se { if (lp_ctx->s3_fns) { if (*ptr == NULL || strcmp(*ptr, pszParmValue) != 0) { - global_iconv_handle = smb_iconv_handle_reinit(NULL, + global_iconv_handle = + smb_iconv_handle_reinit(NULL, lpcfg_dos_charset(lp_ctx), lpcfg_unix_charset(lp_ctx), true, global_iconv_handle); @@ -3357,7 +3358,11 @@ _PUBLIC_ void reload_charcnv(struct loadparm_context *lp_ctx) if (old_ic == NULL) { old_ic = global_iconv_handle; } - lp_ctx->iconv_handle = smb_iconv_handle_reinit_lp(lp_ctx, lp_ctx, old_ic); + lp_ctx->iconv_handle = smb_iconv_handle_reinit(lp_ctx, + lpcfg_dos_charset(lp_ctx), + lpcfg_unix_charset(lp_ctx), + true, + old_ic); global_iconv_handle = lp_ctx->iconv_handle; } diff --git a/lib/param/param.h b/lib/param/param.h index e123e67a990..a6dbafa42f9 100644 --- a/lib/param/param.h +++ b/lib/param/param.h @@ -301,10 +301,6 @@ char *smbd_tmp_path(TALLOC_CTX *mem_ctx, const char *lpcfg_imessaging_path(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx); -struct smb_iconv_handle *smb_iconv_handle_reinit_lp(TALLOC_CTX *mem_ctx, - struct loadparm_context *lp_ctx, - struct smb_iconv_handle *old_ic); - const char *lpcfg_sam_name(struct loadparm_context *lp_ctx); const char *lpcfg_sam_dnsname(struct loadparm_context *lp_ctx); diff --git a/lib/param/util.c b/lib/param/util.c index 233981abfa8..52796562ec5 100644 --- a/lib/param/util.c +++ b/lib/param/util.c @@ -248,17 +248,6 @@ const char *lpcfg_imessaging_path(TALLOC_CTX *mem_ctx, return smbd_tmp_path(mem_ctx, lp_ctx, "msg"); } -struct smb_iconv_handle *smb_iconv_handle_reinit_lp(TALLOC_CTX *mem_ctx, - struct loadparm_context *lp_ctx, - struct smb_iconv_handle *old_ic) -{ - return smb_iconv_handle_reinit(mem_ctx, lpcfg_dos_charset(lp_ctx), - lpcfg_unix_charset(lp_ctx), - true, - old_ic); -} - - const char *lpcfg_sam_name(struct loadparm_context *lp_ctx) { switch (lpcfg_server_role(lp_ctx)) { |