diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-12-13 22:46:33 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2007-12-21 05:50:04 +0100 |
| commit | 2bf0cdd01cf399bf28125f9e2a0d419f4e94996c (patch) | |
| tree | 3ec09d2f58be46c1f2a5a4a73a46100879e84aa4 /source4/lib/charset | |
| parent | 83f9ee5860e581fda07932e0fda1326fa3bd4d4c (diff) | |
| download | samba-2bf0cdd01cf399bf28125f9e2a0d419f4e94996c.tar.gz samba-2bf0cdd01cf399bf28125f9e2a0d419f4e94996c.tar.bz2 samba-2bf0cdd01cf399bf28125f9e2a0d419f4e94996c.zip | |
r26434: Remove display charset from iconv convenience context.
(This used to be commit a76625994abf9906d54ae11f9c171f89063cf508)
Diffstat (limited to 'source4/lib/charset')
| -rw-r--r-- | source4/lib/charset/charcnv.c | 4 | ||||
| -rw-r--r-- | source4/lib/charset/charset.h | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/source4/lib/charset/charcnv.c b/source4/lib/charset/charcnv.c index 5100a1b016..9a4068a4a9 100644 --- a/source4/lib/charset/charcnv.c +++ b/source4/lib/charset/charcnv.c @@ -42,7 +42,6 @@ struct smb_iconv_convenience { const char *unix_charset; const char *dos_charset; - const char *display_charset; bool native_iconv; smb_iconv_t conv_handles[NUM_CHARSETS][NUM_CHARSETS]; }; @@ -57,7 +56,6 @@ static const char *charset_name(struct smb_iconv_convenience *ic, charset_t ch) case CH_UTF16: return "UTF-16LE"; case CH_UNIX: return ic->unix_charset; case CH_DOS: return ic->dos_charset; - case CH_DISPLAY: return ic->display_charset; case CH_UTF8: return "UTF8"; case CH_UTF16BE: return "UTF-16BE"; default: @@ -88,7 +86,6 @@ static int close_iconv(struct smb_iconv_convenience *data) struct smb_iconv_convenience *smb_iconv_convenience_init(TALLOC_CTX *mem_ctx, const char *dos_charset, const char *unix_charset, - const char *display_charset, bool native_iconv) { struct smb_iconv_convenience *ret = talloc_zero(mem_ctx, @@ -102,7 +99,6 @@ struct smb_iconv_convenience *smb_iconv_convenience_init(TALLOC_CTX *mem_ctx, ret->dos_charset = talloc_strdup(ret, dos_charset); ret->unix_charset = talloc_strdup(ret, unix_charset); - ret->display_charset = talloc_strdup(ret, display_charset); ret->native_iconv = native_iconv; return ret; diff --git a/source4/lib/charset/charset.h b/source4/lib/charset/charset.h index b1bb18a7c8..1d42a0ad91 100644 --- a/source4/lib/charset/charset.h +++ b/source4/lib/charset/charset.h @@ -24,9 +24,9 @@ #include <talloc.h> /* this defines the charset types used in samba */ -typedef enum {CH_UTF16=0, CH_UNIX=1, CH_DISPLAY=2, CH_DOS=3, CH_UTF8=4, CH_UTF16BE=5} charset_t; +typedef enum {CH_UTF16=0, CH_UNIX, CH_DOS, CH_UTF8, CH_UTF16BE} charset_t; -#define NUM_CHARSETS 6 +#define NUM_CHARSETS 5 /* * for each charset we have a function that pulls from that charset to |