2000-06-05  Ulrich Drepper  <drepper@redhat.com>

	* iconvdata/ksc5601.h (ksc5601_to_ucs4): Undo *s in all cases of
	an error.
This commit is contained in:
Ulrich Drepper 2000-06-05 22:45:16 +00:00
parent add40772bf
commit b0f1ca6844
2 changed files with 9 additions and 3 deletions

View File

@ -1,3 +1,8 @@
2000-06-05 Ulrich Drepper <drepper@redhat.com>
* iconvdata/ksc5601.h (ksc5601_to_ucs4): Undo *s in all cases of
an error.
2000-06-04 Ulrich Drepper <drepper@redhat.com> 2000-06-04 Ulrich Drepper <drepper@redhat.com>
* iconv/gconv_dl.c (do_release_shlib): Don't reset reference * iconv/gconv_dl.c (do_release_shlib): Don't reset reference

View File

@ -72,14 +72,15 @@ ksc5601_to_ucs4 (const unsigned char **s, size_t avail, unsigned char offset)
if (idx >= 1410 && idx < 1410 + KSC5601_HANGUL) if (idx >= 1410 && idx < 1410 + KSC5601_HANGUL)
return (__ksc5601_hangul_to_ucs[idx - 1410] return (__ksc5601_hangul_to_ucs[idx - 1410]
?: ((*s) -= 2, __UNKNOWN_10646_CHAR)); ?: (*s -= 2, __UNKNOWN_10646_CHAR));
else if (idx >= 3854) else if (idx >= 3854)
/* Hanja : row 42 - row 93 : 3854 = 94 * (42-1) */ /* Hanja : row 42 - row 93 : 3854 = 94 * (42-1) */
return (__ksc5601_hanja_to_ucs[idx - 3854] return (__ksc5601_hanja_to_ucs[idx - 3854]
?: ((*s) -= 2, __UNKNOWN_10646_CHAR)); ?: (*s -= 2, __UNKNOWN_10646_CHAR));
else if (idx <= 1114) else if (idx <= 1114)
return __ksc5601_sym_to_ucs[idx] ?: ((*s) -= 2, __UNKNOWN_10646_CHAR); return __ksc5601_sym_to_ucs[idx] ?: (*s -= 2, __UNKNOWN_10646_CHAR);
*s -= 2;
return __UNKNOWN_10646_CHAR; return __UNKNOWN_10646_CHAR;
} }