diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-09-19 19:13:21 -0700 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-09-20 06:27:06 +0200 |
| commit | f9acf770e9c121aa495cb7e19175a4a6e45ff3d9 (patch) | |
| tree | b64283a8a0f929f28de73f84ef207f5f5018f8f9 /lib/util/charset/charset.h | |
| parent | 8316577b7538f7204c5fd6328756c4c3f171b36e (diff) | |
| download | samba-f9acf770e9c121aa495cb7e19175a4a6e45ff3d9.tar.gz samba-f9acf770e9c121aa495cb7e19175a4a6e45ff3d9.tar.bz2 samba-f9acf770e9c121aa495cb7e19175a4a6e45ff3d9.zip | |
lib/util/charset: remove charset module loading
Now that the 'table' modules are gone, there is no reason for there to
be charset modules at all. This builds the macosxfs and weird modules
into the binary at the appropriate times, and changes the tests to
test instead the difference between the remaining internal handlers
and iconv().
Andrew Bartlett
Autobuild-User: Andrew Bartlett <abartlet@samba.org>
Autobuild-Date: Tue Sep 20 06:27:06 CEST 2011 on sn-devel-104
Diffstat (limited to 'lib/util/charset/charset.h')
| -rw-r--r-- | lib/util/charset/charset.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/lib/util/charset/charset.h b/lib/util/charset/charset.h index 2040e2a87c..d731ad1821 100644 --- a/lib/util/charset/charset.h +++ b/lib/util/charset/charset.h @@ -59,7 +59,7 @@ struct charset_functions { char **outbuf, size_t *outbytesleft); size_t (*push)(void *, const char **inbuf, size_t *inbytesleft, char **outbuf, size_t *outbytesleft); - struct charset_functions *prev, *next; + bool samba_internal_charset; }; /* this type is used for manipulating unicode codepoints */ @@ -171,7 +171,7 @@ struct smb_iconv_handle *get_iconv_handle(void); struct smb_iconv_handle *get_iconv_testing_handle(TALLOC_CTX *mem_ctx, const char *dos_charset, const char *unix_charset, - bool native_iconv); + bool use_builtin_handlers); smb_iconv_t get_conv_handle(struct smb_iconv_handle *ic, charset_t from, charset_t to); const char *charset_name(struct smb_iconv_handle *ic, charset_t ch); @@ -200,7 +200,7 @@ int codepoint_cmpi(codepoint_t c1, codepoint_t c2); struct smb_iconv_handle *smb_iconv_handle_reinit(TALLOC_CTX *mem_ctx, const char *dos_charset, const char *unix_charset, - bool native_iconv, + bool use_builtin_handlers, struct smb_iconv_handle *old_ic); bool convert_string_handle(struct smb_iconv_handle *ic, @@ -225,11 +225,10 @@ size_t smb_iconv(smb_iconv_t cd, const char **inbuf, size_t *inbytesleft, char **outbuf, size_t *outbytesleft); smb_iconv_t smb_iconv_open_ex(TALLOC_CTX *mem_ctx, const char *tocode, - const char *fromcode, bool native_iconv); + const char *fromcode, bool use_builtin_handlers); void load_case_tables(void); void load_case_tables_library(void); -bool smb_register_charset(const struct charset_functions *funcs_in); /* The following definitions come from util_unistr_w.c */ |