diff options
author | Ulrich Drepper <drepper@redhat.com> | 2000-06-16 23:04:41 +0000 |
---|---|---|
committer | Ulrich Drepper <drepper@redhat.com> | 2000-06-16 23:04:41 +0000 |
commit | 323fb88dac799cddfaa33cb80f7fc3395c2297e5 (patch) | |
tree | f853cfdf9b5bcde5a90324bb2115b225bb405ebd /iconvdata/iso-2022-jp.c | |
parent | f1d5c60ddef851078544e6b8456b18534b9a2a95 (diff) | |
download | glibc-323fb88dac799cddfaa33cb80f7fc3395c2297e5.zip glibc-323fb88dac799cddfaa33cb80f7fc3395c2297e5.tar.gz glibc-323fb88dac799cddfaa33cb80f7fc3395c2297e5.tar.bz2 |
Update.
2000-06-16 Ulrich Drepper <drepper@redhat.com>
* iconv/gconv_int.h (norm_add_slashes): Optionally add given suffix.
* iconv/gconv_open.c: Remove error handling specification from `from'
character set name.
* intl/loadmsgcat.c (_nl_load_domain): Call norm_add_slashes with
new parameter to always enable transliteration.
* locale/localeinfo.h (LIMAGIC): Bump number because of incompatible
change.
(struct locale_data): Add new members use_translit and options.
* locale/findlocale.c (_nl_find_locale): Set use_translit flag is
character set name contained modifier TRANSLIT.
* locale/loadlocale.c (_nl_load_locale): Initialize new use_translit
and options fields.
(_nl_unload_locale): Free options string if necessary.
* wcsmbs/wcsmbsload.c (__wcsmbs_load_conv): Enable translation if
the locale names suggested this.
* locale/C-address.c: Add two new initialilzers to adjust data
structure for new format.
* locale/C-collate.c: Likewise.
* locale/C-ctype.c: Likewise.
* locale/C-identification.c: Likewise.
* locale/C-measurement.c: Likewise.
* locale/C-messages.c: Likewise.
* locale/C-monetary.c: Likewise.
* locale/C-name.c: Likewise.
* locale/C-numeric.c: Likewise.
* locale/C-paper.c: Likewise.
* locale/C-telephone.c: Likewise.
* locale/C-time.c: Likewise.
* locale/setlocale.c: Add some more __builtin_expect.
Diffstat (limited to 'iconvdata/iso-2022-jp.c')
-rw-r--r-- | iconvdata/iso-2022-jp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/iconvdata/iso-2022-jp.c b/iconvdata/iso-2022-jp.c index b66c950..ab42bcc 100644 --- a/iconvdata/iso-2022-jp.c +++ b/iconvdata/iso-2022-jp.c @@ -707,7 +707,7 @@ gconv_end (struct __gconv_step *data) { \ result = DL_CALL_FCT (step_data->__trans.__trans_fct, \ (step, step_data, *inptrp, \ - &inptr, inend, &outbuf, \ + &inptr, inend, &outptr, \ irreversible)); \ if (result != __GCONV_OK) \ break; \ @@ -894,7 +894,7 @@ gconv_end (struct __gconv_step *data) result = DL_CALL_FCT \ (step_data->__trans.__trans_fct,\ (step, step_data, *inptrp, \ - &inptr, inend, &outbuf, \ + &inptr, inend, &outptr, \ irreversible)); \ if (result != __GCONV_OK) \ break; \ |