diff options
| author | Jeremy Allison <jra@samba.org> | 2004-03-11 22:48:24 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2004-03-11 22:48:24 +0000 |
| commit | e3f5b542707e2328030b9d5eff0836a904eccde5 (patch) | |
| tree | 13124522e17aa9464fa9e4b965f6b34112af0307 /source3/lib/util_unistr.c | |
| parent | 3d18997afda94504e9db24115aaa56a58086a653 (diff) | |
| download | samba-e3f5b542707e2328030b9d5eff0836a904eccde5.tar.gz samba-e3f5b542707e2328030b9d5eff0836a904eccde5.tar.bz2 samba-e3f5b542707e2328030b9d5eff0836a904eccde5.zip | |
Restore the contract on all convert_stringXX() interfaces. Add a "allow_bad_conv"
boolean parameter that allows broken iconv conversions to work. Gets rid of the
nasty errno checks in mangle_hash2 and check_path_syntax and allows correct
return code checking.
Jeremy.
(This used to be commit 7b96765c23637613f079d37566d95d5edd511f05)
Diffstat (limited to 'source3/lib/util_unistr.c')
| -rw-r--r-- | source3/lib/util_unistr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/lib/util_unistr.c b/source3/lib/util_unistr.c index e90a824395..005f10a4c0 100644 --- a/source3/lib/util_unistr.c +++ b/source3/lib/util_unistr.c @@ -109,9 +109,9 @@ static int check_dos_char_slowly(smb_ucs2_t c) char buf[10]; smb_ucs2_t c2 = 0; int len1, len2; - len1 = convert_string(CH_UCS2, CH_DOS, &c, 2, buf, sizeof(buf)); + len1 = convert_string(CH_UCS2, CH_DOS, &c, 2, buf, sizeof(buf),False); if (len1 == 0) return 0; - len2 = convert_string(CH_DOS, CH_UCS2, buf, len1, &c2, 2); + len2 = convert_string(CH_DOS, CH_UCS2, buf, len1, &c2, 2,False); if (len2 != 2) return 0; return (c == c2); } |