diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-08-29 13:07:03 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 15:03:10 -0500 |
| commit | 0b91f3916430d0271eab867675d44c5439de40c2 (patch) | |
| tree | 8740c4d73ec89cd60125117ed45e80b771e9e06b /source4/lib/charset | |
| parent | b867b3c1470ee260fe2fd14f628728f01f7917ac (diff) | |
| download | samba-0b91f3916430d0271eab867675d44c5439de40c2.tar.gz samba-0b91f3916430d0271eab867675d44c5439de40c2.tar.bz2 samba-0b91f3916430d0271eab867675d44c5439de40c2.zip | |
r24780: More work allowing libutil to be used by external users.
(This used to be commit 31993cf67b816a184a4a4e92ef8ca2532c797190)
Diffstat (limited to 'source4/lib/charset')
| -rw-r--r-- | source4/lib/charset/charcnv.c | 10 | ||||
| -rw-r--r-- | source4/lib/charset/charset.h | 5 |
2 files changed, 12 insertions, 3 deletions
diff --git a/source4/lib/charset/charcnv.c b/source4/lib/charset/charcnv.c index 0f6e53f52c..fcf29d4647 100644 --- a/source4/lib/charset/charcnv.c +++ b/source4/lib/charset/charcnv.c @@ -37,6 +37,10 @@ * @sa lib/iconv.c */ +char *unix_charset = NULL; +char *dos_charset = NULL; +char *display_charset = NULL; + /** * Return the name of a charset to give to iconv(). **/ @@ -44,9 +48,9 @@ static const char *charset_name(charset_t ch) { switch (ch) { case CH_UTF16: return "UTF-16LE"; - case CH_UNIX: return lp_unix_charset(); - case CH_DOS: return lp_dos_charset(); - case CH_DISPLAY: return lp_display_charset(); + case CH_UNIX: return unix_charset; + case CH_DOS: return dos_charset; + case CH_DISPLAY: return display_charset; case CH_UTF8: return "UTF8"; case CH_UTF16BE: return "UTF-16BE"; default: diff --git a/source4/lib/charset/charset.h b/source4/lib/charset/charset.h index e62f99a8fe..3c548192b6 100644 --- a/source4/lib/charset/charset.h +++ b/source4/lib/charset/charset.h @@ -77,4 +77,9 @@ typedef struct { #define strlower(s) strlower_m(s) #define strupper(s) strupper_m(s) +/* from lib/charset */ +extern char *dos_charset; +extern char *unix_charset; +extern char *display_charset; + #endif /* __CHARSET_H__ */ |