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/fileops.c | |
| parent | df6c012b99499d95ed7fee53553a9f4d4473ccae (diff) | |
| download | glibc-30bfee2630b960050d1d50cafaab43fc171abc03.tar.gz | |
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/fileops.c')
| -rw-r--r-- | libio/fileops.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/libio/fileops.c b/libio/fileops.c index ec1e2b5904..79ad15351f 100644 --- a/libio/fileops.c +++ b/libio/fileops.c @@ -494,13 +494,9 @@ _IO_new_file_underflow (FILE *fp) _IO_doallocbuf (fp); } - /* Flush all line buffered files before reading. */ /* FIXME This can/should be moved to genops ?? */ if (fp->_flags & (_IO_LINE_BUF|_IO_UNBUFFERED)) { -#if 0 - _IO_flush_all_linebuffered (); -#else /* We used to flush all line-buffered stream. This really isn't required by any standard. My recollection is that traditional Unix systems did this for stdout. stderr better @@ -513,7 +509,6 @@ _IO_new_file_underflow (FILE *fp) _IO_OVERFLOW (_IO_stdout, EOF); _IO_release_lock (_IO_stdout); -#endif } _IO_switch_to_get_mode (fp); @@ -813,10 +808,6 @@ _IO_new_file_sync (FILE *fp) delta = fp->_IO_read_ptr - fp->_IO_read_end; if (delta != 0) { -#ifdef TODO - if (_IO_in_backup (fp)) - delta -= eGptr () - Gbase (); -#endif off64_t new_pos = _IO_SYSSEEK (fp, delta, 1); if (new_pos != (off64_t) EOF) fp->_IO_read_end = fp->_IO_read_ptr; @@ -838,10 +829,6 @@ _IO_file_sync_mmap (FILE *fp) { if (fp->_IO_read_ptr != fp->_IO_read_end) { -#ifdef TODO - if (_IO_in_backup (fp)) - delta -= eGptr () - Gbase (); -#endif if (__lseek64 (fp->_fileno, fp->_IO_read_ptr - fp->_IO_buf_base, SEEK_SET) != fp->_IO_read_ptr - fp->_IO_buf_base) |