aboutsummaryrefslogtreecommitdiff
path: root/libio/iofclose.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2001-07-27 08:29:06 +0000
committerUlrich Drepper <drepper@redhat.com>2001-07-27 08:29:06 +0000
commit129d706d77587e4d6627cc1ebef9be0f7cbc65f0 (patch)
tree219bd622277bf2262d16cd4fd0400bd1ef7aea7e /libio/iofclose.c
parent6a904bbfc610f98ee2f467844434117a7bca5982 (diff)
downloadglibc-129d706d77587e4d6627cc1ebef9be0f7cbc65f0.zip
glibc-129d706d77587e4d6627cc1ebef9be0f7cbc65f0.tar.gz
glibc-129d706d77587e4d6627cc1ebef9be0f7cbc65f0.tar.bz2
Update.
* libio/fileops.c (_IO_new_file_fopen): Correctly locate ccs= substring. Don't handle ccs= if no descriptor was allocated. Normalize codeset name before calling __wcsmbs_named_conv. Initialize transliteration elements. Free step data structure. * libio/iofclose.c (_IO_new_fclose): Correct freeing of the step data. * libio/iofwide.c (__libio_translit): Renamed from libio_translit and made public. Various little cleanup changes. * wcsmbs/wcsmbsload.h (struct gconv_fcts): Add towc_nsteps and tomb_nsteps member. * wcsmbs/wcsmbsload.c: Add some casts to avoid warnings. (__wcsmbs_gconv_fcts): Initialize towc_nsteps and tomb_nsteps member. (getfct): Take additional parameter with pointer to variable where the number of steps is stored in. Disable code which allows to use more than one step for now. Adjust all callers. (free_mem): New function. Frees data associated with currently selected converters.
Diffstat (limited to 'libio/iofclose.c')
-rw-r--r--libio/iofclose.c12
1 files changed, 2 insertions, 10 deletions
diff --git a/libio/iofclose.c b/libio/iofclose.c
index 660c118..45bd0af 100644
--- a/libio/iofclose.c
+++ b/libio/iofclose.c
@@ -72,16 +72,8 @@ _IO_new_fclose (fp)
the conversion functions. */
struct _IO_codecvt *cc = fp->_codecvt;
- if (cc->__cd_in.__cd.__steps->__shlib_handle != NULL)
- {
- --cc->__cd_in.__cd.__steps->__counter;
- __gconv_close_transform (cc->__cd_in.__cd.__steps, 1);
- }
- if (cc->__cd_out.__cd.__steps->__shlib_handle != NULL)
- {
- --cc->__cd_out.__cd.__steps->__counter;
- __gconv_close_transform (cc->__cd_out.__cd.__steps, 1);
- }
+ __gconv_release_step (cc->__cd_in.__cd.__steps);
+ __gconv_release_step (cc->__cd_out.__cd.__steps);
#endif
}
_IO_cleanup_region_end (0);