Lines 145-156
Link Here
|
145 |
|
145 |
|
146 |
res = UTF8Toisolat1( b, &outlen, (unsigned char*)s, &inlen ); |
146 |
res = UTF8Toisolat1( b, &outlen, (unsigned char*)s, &inlen ); |
147 |
|
147 |
|
148 |
if ( res == -2 ) |
148 |
if ( res >= 0 ) |
|
|
149 |
r = (char*)b; |
150 |
else if ( res == -2 ) |
149 |
printf("UTF8Toisolat1 transcoding fail: '%s'\n",s); |
151 |
printf("UTF8Toisolat1 transcoding fail: '%s'\n",s); |
150 |
else if ( res == -1 ) |
152 |
else if ( res == -1 ) |
151 |
printf("UTF8Toisolat1 fail: '%s'\n",s); |
153 |
printf("UTF8Toisolat1 fail: '%s'\n",s); |
152 |
else if ( res == 0 ) |
|
|
153 |
r = (char*)b; |
154 |
else |
154 |
else |
155 |
printf("CXml::xml_UTF8Toisolat1 error %d\n",res); |
155 |
printf("CXml::xml_UTF8Toisolat1 error %d\n",res); |
156 |
|
156 |
|
Lines 178-187
Link Here
|
178 |
|
178 |
|
179 |
res = isolat1ToUTF8( b, &outlen, (unsigned char*)s, &inlen ); |
179 |
res = isolat1ToUTF8( b, &outlen, (unsigned char*)s, &inlen ); |
180 |
|
180 |
|
181 |
if ( res == -1 ) |
181 |
if ( res >= 0 ) |
|
|
182 |
r = (char*)b; |
183 |
else if ( res == -1 ) |
182 |
printf("isolat1ToUTF8 fail: '%s'\n",s); |
184 |
printf("isolat1ToUTF8 fail: '%s'\n",s); |
183 |
else if ( res == 0 ) |
|
|
184 |
r = (char*)b; |
185 |
|
185 |
|
186 |
free(b); |
186 |
free(b); |