gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-05-30 00:11:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

In iconv_cstrtoustr() and iconv_ustrtocstr() report if a iconv

Browse source 
conversion cannot be found. Also added a type convert to the iconv
call, so that the compiler wont report a type mismatch.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@11140 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Fred Kiefer 2001-10-14 21:34:31 +00:00
parent 98a8f11688
commit 52c9e52b5f
1 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Source/Unicode.m
View file

@ -379,10 +379,12 @@ iconv_cstrtoustr(unichar *u2, int size2, const char *s1, int size1,
conv = iconv_open(UNICODE_ENC, iconv_stringforencoding(enc));
if (conv == (iconv_t)-1)
{
NSLog(@"No iconv for encoding %@ tried to use %s",
GetEncodingName(enc), iconv_stringforencoding(enc));
return 0;
}
ret_val = iconv(conv, &s1, &size1, &u1, &usize);
ret_val = iconv(conv, (char**)&s1, &size1, &u1, &usize);
// close the converter
iconv_close(conv);
if (ret_val == -1)
@ -406,10 +408,12 @@ iconv_ustrtocstr(char *s2, int size2, const unichar *u1, int size1,
conv = iconv_open(iconv_stringforencoding(enc), UNICODE_ENC);
if (conv == (iconv_t)-1)
{
NSLog(@"No iconv for encoding %@ tried to use %s",
GetEncodingName(enc), iconv_stringforencoding(enc));
return 0;
}
ret_val = iconv(conv, &u2, &usize, &s2, &size2);
ret_val = iconv(conv, (char**)&u2, &usize, &s2, &size2);
// close the converter
iconv_close(conv);
if (ret_val == -1)