diff options
author | Zack Weinberg <zackw@panix.com> | 2018-02-21 14:38:24 -0500 |
---|---|---|
committer | Zack Weinberg <zackw@panix.com> | 2018-02-21 14:39:54 -0500 |
commit | 30bfee2630b960050d1d50cafaab43fc171abc03 (patch) | |
tree | 0e07b4ca9b2e087edec24afe3bfa07b42f7cfdb2 /libio/wgenops.c | |
parent | df6c012b99499d95ed7fee53553a9f4d4473ccae (diff) | |
download | glibc-30bfee2630b960050d1d50cafaab43fc171abc03.tar.gz glibc-30bfee2630b960050d1d50cafaab43fc171abc03.tar.xz glibc-30bfee2630b960050d1d50cafaab43fc171abc03.zip |
Remove miscellaneous debris from libio.
This patch eliminates a number of #if 0 and #ifdef TODO blocks, macros that are never used, macros that provide portability to substrates that lack basic things like EINVAL and off_t, and other such debris. I preserved IO_DEBUG and CHECK_FILE, even though as far as I can tell IO_DEBUG is never defined and therefore CHECK_FILE never does anything, because it seems like we might actually want to turn it _on_. Installed stripped libraries and executables are unchanged, except, again, that the line number of an assertion changes (this time it's somewhere in fileops.c). * libio/libio.h (_IO_pos_BAD, _IO_pos_0, _IO_pos_adjust): Define here, unconditionally. * libio/iolibio.h (_IO_pos_BAD): Don't define here. * libio/libioP.h: Remove #if 0 blocks. (_IO_pos_BAD, _IO_pos_0, _IO_pos_adjust): Don't define here. (_IO_va_start, COERCE_FILE, MAYBE_SET_EINVAL): Don't define. (CHECK_FILE): Don't use MAYBE_SET_EINVAL or COERCE_FILE. Fix style. * libio/clearerr.c, libio/fputc.c, libio/getchar.c: Assume weak_alias is always defined. * libio/fileops.c, libio/genops.c, libio/oldfileops.c * libio/oldpclose.c, libio/pclose.c, libio/wfileops.c: Remove #if 0 and #ifdef TODO blocks. Assume text_set_element is always defined. * libio/iofdopen.c, libio/iogetdelim.c, libio/oldiofdopen.c Use __set_errno (EINVAL) instead of MAYBE_SET_EINVAL. * libio/tst-mmap-eofsync.c: Make #if 1 block unconditional.
Diffstat (limited to 'libio/wgenops.c')
-rw-r--r-- | libio/wgenops.c | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/libio/wgenops.c b/libio/wgenops.c index e8f5a539ee..884d72deba 100644 --- a/libio/wgenops.c +++ b/libio/wgenops.c @@ -426,26 +426,6 @@ _IO_free_wbackup_area (FILE *fp) } libc_hidden_def (_IO_free_wbackup_area) -#if 0 -int -_IO_switch_to_wput_mode (FILE *fp) -{ - fp->_wide_data->_IO_write_base = fp->_wide_data->_IO_read_ptr; - fp->_wide_data->_IO_write_ptr = fp->_wide_data->_IO_read_ptr; - /* Following is wrong if line- or un-buffered? */ - fp->_wide_data->_IO_write_end = (fp->_flags & _IO_IN_BACKUP - ? fp->_wide_data->_IO_read_end - : fp->_wide_data->_IO_buf_end); - - fp->_wide_data->_IO_read_ptr = fp->_wide_data->_IO_read_end; - fp->_wide_data->_IO_read_base = fp->_wide_data->_IO_read_end; - - fp->_flags |= _IO_CURRENTLY_PUTTING; - return 0; -} -#endif - - static int save_for_wbackup (FILE *fp, wchar_t *end_p) { @@ -624,20 +604,6 @@ _IO_unsave_wmarkers (FILE *fp) struct _IO_marker *mark = fp->_markers; if (mark) { -#ifdef TODO - streampos offset = seekoff (0, ios::cur, ios::in); - if (offset != EOF) - { - offset += eGptr () - Gbase (); - for ( ; mark != NULL; mark = mark->_next) - mark->set_streampos (mark->_pos + offset); - } - else - { - for ( ; mark != NULL; mark = mark->_next) - mark->set_streampos (EOF); - } -#endif fp->_markers = 0; } |