diff options
| author | Florian Weimer <fweimer@redhat.com> | 2014-09-12 09:17:32 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2014-09-12 09:17:32 +0200 |
| commit | ba7b4d294b01870ce3497971e9d07ee261cdc540 (patch) | |
| tree | f68e63afa5218a87f37c98c45ce8d7f62ec81bb0 /libio/fileops.c | |
| parent | 5379aebddd0a35c052e7149fb4ff88b49676516e (diff) | |
| download | glibc-ba7b4d294b01870ce3497971e9d07ee261cdc540.zip glibc-ba7b4d294b01870ce3497971e9d07ee261cdc540.tar.gz glibc-ba7b4d294b01870ce3497971e9d07ee261cdc540.tar.bz2 | |
Complete the removal of __gconv_translit_find
Prior to the 2.20 release, the function was just changed to fail
unconditionally, in commit a1a6a401ab0a3c9f15fb7eaebbdcee24192254e8.
This commit removes the function completely, including gconv bits
which depend on it.
This changes the gconv ABI, which is not a public interface.
Diffstat (limited to 'libio/fileops.c')
| -rw-r--r-- | libio/fileops.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/libio/fileops.c b/libio/fileops.c index 204cfea..e0d7b76 100644 --- a/libio/fileops.c +++ b/libio/fileops.c @@ -403,21 +403,16 @@ _IO_new_file_fopen (fp, filename, mode, is32not64) cc->__cd_in.__cd.__data[0].__flags = __GCONV_IS_LAST; cc->__cd_in.__cd.__data[0].__statep = &result->_wide_data->_IO_state; - /* XXX For now no transliteration. */ - cc->__cd_in.__cd.__data[0].__trans = NULL; - cc->__cd_out.__cd.__nsteps = fcts.tomb_nsteps; cc->__cd_out.__cd.__steps = fcts.tomb; cc->__cd_out.__cd.__data[0].__invocation_counter = 0; cc->__cd_out.__cd.__data[0].__internal_use = 1; - cc->__cd_out.__cd.__data[0].__flags = __GCONV_IS_LAST; + cc->__cd_out.__cd.__data[0].__flags + = __GCONV_IS_LAST | __GCONV_TRANSLIT; cc->__cd_out.__cd.__data[0].__statep = &result->_wide_data->_IO_state; - /* And now the transliteration. */ - cc->__cd_out.__cd.__data[0].__trans = &__libio_translit; - /* From now on use the wide character callback functions. */ ((struct _IO_FILE_plus *) fp)->vtable = fp->_wide_data->_wide_vtable; |