diff options
| author | Andrew Tridgell <tridge@samba.org> | 2001-09-07 14:14:57 +0000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2001-09-07 14:14:57 +0000 |
| commit | 5573a1c7394362f5e46c58b8cfaf6bf7a080c391 (patch) | |
| tree | fffa468b63bbb72701e4ed06667fbdf3459ea19b /source3/lib/iconv.c | |
| parent | 83ebf2b6b282926930dc2c5dee3b5f18447d6e81 (diff) | |
| download | samba-5573a1c7394362f5e46c58b8cfaf6bf7a080c391.tar.gz samba-5573a1c7394362f5e46c58b8cfaf6bf7a080c391.tar.bz2 samba-5573a1c7394362f5e46c58b8cfaf6bf7a080c391.zip | |
added "display charset" option in smb.conf, along with d_printf()
which should now be used instead of DEBUG(0) or printf() for
interactive messages
I have only converted client.c to use d_printf(), and the code hasn't
had much testing yet. Eventually we want all interactive code to use
d_printf(), plus SWAT
(This used to be commit 266d8e67669adb329f25676c4bc4d4c50f223428)
Diffstat (limited to 'source3/lib/iconv.c')
| -rw-r--r-- | source3/lib/iconv.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/lib/iconv.c b/source3/lib/iconv.c index 2285d8debf..46507dd624 100644 --- a/source3/lib/iconv.c +++ b/source3/lib/iconv.c @@ -142,12 +142,12 @@ smb_iconv_t smb_iconv_open(const char *tocode, const char *fromcode) if (!charsets[from].name) { ret->pull = sys_iconv; ret->cd_pull = iconv_open("UCS-2LE", fromcode); - if (!ret->cd_pull) goto failed; + if (ret->cd_pull == (iconv_t)-1) goto failed; } if (!charsets[to].name) { ret->push = sys_iconv; ret->cd_push = iconv_open(tocode, "UCS-2LE"); - if (!ret->cd_push) goto failed; + if (ret->cd_push == (iconv_t)-1) goto failed; } #else if (!charsets[from].name || !charsets[to].name) { |