diff options
author | Andrew Bartlett <abartlet@samba.org> | 2011-02-18 13:47:28 +1100 |
---|---|---|
committer | Andrew Bartlett <abartlet@samba.org> | 2011-02-18 18:41:01 +1100 |
commit | 2a3a86a86f3d1ab97adda563beda7ee35f6a2414 (patch) | |
tree | 38b9f9b9818482cdfe6ecdb9ee797fe2f3531e7d /lib/util/charset/charset.h | |
parent | 5155a5f5c130ff5b71ce4e37877378a6967046b4 (diff) | |
download | samba-2a3a86a86f3d1ab97adda563beda7ee35f6a2414.tar.gz samba-2a3a86a86f3d1ab97adda563beda7ee35f6a2414.tar.bz2 samba-2a3a86a86f3d1ab97adda563beda7ee35f6a2414.zip |
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
Diffstat (limited to 'lib/util/charset/charset.h')
-rw-r--r-- | lib/util/charset/charset.h | 5 |
1 files changed, 5 insertions, 0 deletions
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); |