diff options
| author | Florian Weimer <fweimer@redhat.com> | 2019-11-03 11:39:56 +0100 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2019-11-03 18:10:20 +0100 |
| commit | 96ab757f9cd22bc880e0fcbe65a012c3726a9b87 (patch) | |
| tree | 30667e677247bfdb1f91d3af9581cbb78b923bc6 /libio/iofclose.c | |
| parent | 7591046cb1bf663525ed73229ab1ec03eb756326 (diff) | |
| download | glibc-fw/bug25097.tar.xz glibc-fw/bug25097.zip | |
Redefine _IO_iconv_t to store a single gconv step pointer [BZ #25097]fw/bug25097
libio can only deal with gconv conversions which consist of a single
step. Not using __gconv_info simplifies the data structures somewhat.
This eliminates a new GCC 10 warning about subscribing an inner
zero-length array.
Tested on x86_64-linux-gnu with mainline GCC. Built with
build-many-glibcs.py, also with mainline GCC. Due to GCC PR 92039,
there are failures left on 32-bit architectures with float128 support.
Change-Id: I8b4c489b619a53154712ff32e1b6f13bb92d4203
Diffstat (limited to 'libio/iofclose.c')
| -rw-r--r-- | libio/iofclose.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libio/iofclose.c b/libio/iofclose.c index 398b86d597..3c648d6c13 100644 --- a/libio/iofclose.c +++ b/libio/iofclose.c @@ -62,8 +62,8 @@ _IO_new_fclose (FILE *fp) struct _IO_codecvt *cc = fp->_codecvt; __libc_lock_lock (__gconv_lock); - __gconv_release_step (cc->__cd_in.__cd.__steps); - __gconv_release_step (cc->__cd_out.__cd.__steps); + __gconv_release_step (cc->__cd_in.step); + __gconv_release_step (cc->__cd_out.step); __libc_lock_unlock (__gconv_lock); } else |