From 2a3a86a86f3d1ab97adda563beda7ee35f6a2414 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Fri, 18 Feb 2011 13:47:28 +1100 Subject: lib/util/charcnv Move iconv handle setup in common We now use the struct smb_iconv_convenience at the core of all our iconv code, and use global_iconv_convenience for the callers that don't specify one. Andrew Bartlett --- lib/util/charset/charset.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'lib/util/charset/charset.h') diff --git a/lib/util/charset/charset.h b/lib/util/charset/charset.h index 28d762578b..b4a5a55461 100644 --- a/lib/util/charset/charset.h +++ b/lib/util/charset/charset.h @@ -170,6 +170,10 @@ ssize_t iconv_talloc(TALLOC_CTX *mem_ctx, void *dest); extern struct smb_iconv_convenience *global_iconv_convenience; +struct smb_iconv_convenience *get_iconv_convenience(void); +smb_iconv_t get_conv_handle(struct smb_iconv_convenience *ic, + charset_t from, charset_t to); +const char *charset_name(struct smb_iconv_convenience *ic, charset_t ch); codepoint_t next_codepoint_ext(const char *str, charset_t src_charset, size_t *size); @@ -195,6 +199,7 @@ int codepoint_cmpi(codepoint_t c1, codepoint_t c2); struct smb_iconv_convenience *smb_iconv_convenience_reinit(TALLOC_CTX *mem_ctx, const char *dos_charset, const char *unix_charset, + const char *display_charset, bool native_iconv, struct smb_iconv_convenience *old_ic); -- cgit