diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-03-25 08:37:00 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2011-03-25 04:37:06 +0100 |
| commit | b5616adc8adbcee61bb670378f9c066225d9dcf3 (patch) | |
| tree | 29cf788ade306c9ec3eb95493a6db71a7936f898 /source4/param | |
| parent | 7824111d07ae12b34e03da1e72884d421a9f9f33 (diff) | |
| download | samba-b5616adc8adbcee61bb670378f9c066225d9dcf3.tar.gz samba-b5616adc8adbcee61bb670378f9c066225d9dcf3.tar.bz2 samba-b5616adc8adbcee61bb670378f9c066225d9dcf3.zip | |
lib/util/charset rename iconv_convenience to iconv_handle
This better reflects what this structure is
Andrew Bartlett
Diffstat (limited to 'source4/param')
| -rw-r--r-- | source4/param/loadparm.c | 16 | ||||
| -rw-r--r-- | source4/param/param.h | 6 | ||||
| -rw-r--r-- | source4/param/util.c | 6 |
3 files changed, 14 insertions, 14 deletions
diff --git a/source4/param/loadparm.c b/source4/param/loadparm.c index 49d2e1cf74..f69dfd18c5 100644 --- a/source4/param/loadparm.c +++ b/source4/param/loadparm.c @@ -519,7 +519,7 @@ struct loadparm_context { struct loadparm_global *globals; struct loadparm_service **services; struct loadparm_service *sDefault; - struct smb_iconv_convenience *iconv_convenience; + struct smb_iconv_handle *iconv_handle; int iNumServices; struct loadparm_service *currentService; bool bInGlobalSection; @@ -2782,22 +2782,22 @@ int lpcfg_maxprintjobs(struct loadparm_service *service, struct loadparm_service return maxjobs; } -struct smb_iconv_convenience *lpcfg_iconv_convenience(struct loadparm_context *lp_ctx) +struct smb_iconv_handle *lpcfg_iconv_handle(struct loadparm_context *lp_ctx) { if (lp_ctx == NULL) { - return get_iconv_convenience(); + return get_iconv_handle(); } - return lp_ctx->iconv_convenience; + return lp_ctx->iconv_handle; } _PUBLIC_ void reload_charcnv(struct loadparm_context *lp_ctx) { - struct smb_iconv_convenience *old_ic = lp_ctx->iconv_convenience; + struct smb_iconv_handle *old_ic = lp_ctx->iconv_handle; if (old_ic == NULL) { - old_ic = global_iconv_convenience; + old_ic = global_iconv_handle; } - lp_ctx->iconv_convenience = smb_iconv_convenience_reinit_lp(lp_ctx, lp_ctx, old_ic); - global_iconv_convenience = lp_ctx->iconv_convenience; + lp_ctx->iconv_handle = smb_iconv_handle_reinit_lp(lp_ctx, lp_ctx, old_ic); + global_iconv_handle = lp_ctx->iconv_handle; } void lpcfg_smbcli_options(struct loadparm_context *lp_ctx, diff --git a/source4/param/param.h b/source4/param/param.h index 19ec6322d3..b8fb369bdb 100644 --- a/source4/param/param.h +++ b/source4/param/param.h @@ -222,7 +222,7 @@ const char *lpcfg_printername(struct loadparm_service *service, struct loadparm_ * Return the max print jobs per queue. */ int lpcfg_maxprintjobs(struct loadparm_service *service, struct loadparm_service *sDefault); -struct smb_iconv_convenience *lpcfg_iconv_convenience(struct loadparm_context *lp_ctx); +struct smb_iconv_handle *lpcfg_iconv_handle(struct loadparm_context *lp_ctx); void lpcfg_smbcli_options(struct loadparm_context *lp_ctx, struct smbcli_options *options); void lpcfg_smbcli_session_options(struct loadparm_context *lp_ctx, @@ -334,9 +334,9 @@ bool run_init_functions(init_module_fn *fns); init_module_fn *load_samba_modules(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx, const char *subsystem); const char *lpcfg_messaging_path(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx); -struct smb_iconv_convenience *smb_iconv_convenience_reinit_lp(TALLOC_CTX *mem_ctx, +struct smb_iconv_handle *smb_iconv_handle_reinit_lp(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx, - struct smb_iconv_convenience *old_ic); + struct smb_iconv_handle *old_ic); const char *lpcfg_sam_name(struct loadparm_context *lp_ctx); diff --git a/source4/param/util.c b/source4/param/util.c index c6dca6076e..3413f25e49 100644 --- a/source4/param/util.c +++ b/source4/param/util.c @@ -298,11 +298,11 @@ const char *lpcfg_messaging_path(TALLOC_CTX *mem_ctx, return smbd_tmp_path(mem_ctx, lp_ctx, "msg"); } -struct smb_iconv_convenience *smb_iconv_convenience_reinit_lp(TALLOC_CTX *mem_ctx, +struct smb_iconv_handle *smb_iconv_handle_reinit_lp(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx, - struct smb_iconv_convenience *old_ic) + struct smb_iconv_handle *old_ic) { - return smb_iconv_convenience_reinit(mem_ctx, lpcfg_dos_charset(lp_ctx), + return smb_iconv_handle_reinit(mem_ctx, lpcfg_dos_charset(lp_ctx), lpcfg_unix_charset(lp_ctx), lpcfg_display_charset(lp_ctx), lpcfg_parm_bool(lp_ctx, NULL, "iconv", "native", true), |