diff options
| author | Florian Weimer <fweimer@redhat.com> | 2016-03-07 17:05:06 +0100 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2016-03-07 17:05:06 +0100 |
| commit | abc40bb2a78b358935a604451b7e7eb83d8d77c4 (patch) | |
| tree | 21bc403d5d3b0110f62ed172d8a0fc5da3725ce4 | |
| parent | 3c0f7407eedb524c9114bb675cd55b903c71daaa (diff) | |
| download | glibc-abc40bb2a78b358935a604451b7e7eb83d8d77c4.tar.gz glibc-abc40bb2a78b358935a604451b7e7eb83d8d77c4.tar.xz glibc-abc40bb2a78b358935a604451b7e7eb83d8d77c4.zip | |
libio: Clean up _IO_file_doallocate and _IO_wfile_doallocate
No functional changes.
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | libio/filedoalloc.c | 36 | ||||
| -rw-r--r-- | libio/wfiledoalloc.c | 20 |
3 files changed, 14 insertions, 50 deletions
diff --git a/ChangeLog b/ChangeLog index c57c2fe576..882f22ce9c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,13 @@ 2016-03-07 Florian Weimer <fweimer@redhat.com> + * libio/filedoalloc.c (isatty): Remove. + (local_isatty): Add comment. Call __isatty directly. + (_IO_file_doallocate): Update comment. Assume _LIBC. + * libio/wfiledoalloc.c (isatty): Remove. + (_IO_wfile_doallocate): Update comment. + +2016-03-07 Florian Weimer <fweimer@redhat.com> + [BZ #19269] * sysdeps/x86_64/Makefile (tst-audit4): Depend on tst-audit4-aux.o. diff --git a/libio/filedoalloc.c b/libio/filedoalloc.c index b51e910131..4f9d738968 100644 --- a/libio/filedoalloc.c +++ b/libio/filedoalloc.c @@ -55,41 +55,24 @@ /* Modified for GNU iostream by Per Bothner 1991, 1992. */ -#ifndef _POSIX_SOURCE -# define _POSIX_SOURCE -#endif #include "libioP.h" -#include <sys/types.h> +#include <device-nrs.h> #include <sys/stat.h> #include <stdlib.h> #include <unistd.h> -#ifdef _LIBC -# undef isatty -# define isatty(Fd) __isatty (Fd) - -# include <device-nrs.h> -#endif - - +/* Return the result of isatty, without changing errno. */ static int local_isatty (int fd) { int save_errno = errno; - int res = isatty (fd); + int res = __isatty (fd); __set_errno (save_errno); return res; } - -/* - * Allocate a file buffer, or switch to unbuffered I/O. - * Per the ANSI C standard, ALL tty devices default to line buffered. - * - * As a side effect, we set __SOPT or __SNPT (en/dis-able fseek - * optimisation) right after the _fstat() that finds the buffer size. - */ - +/* Allocate a file buffer, or switch to unbuffered I/O. Streams for + TTY devices default to line buffered. */ int _IO_file_doallocate (_IO_FILE *fp) { @@ -97,15 +80,6 @@ _IO_file_doallocate (_IO_FILE *fp) char *p; struct stat64 st; -#ifndef _LIBC - /* If _IO_cleanup_registration_needed is non-zero, we should call the - function it points to. This is to make sure _IO_cleanup gets called - on exit. We call it from _IO_file_doallocate, since that is likely - to get called by any program that does buffered I/O. */ - if (__glibc_unlikely (_IO_cleanup_registration_needed != NULL)) - (*_IO_cleanup_registration_needed) (); -#endif - size = _IO_BUFSIZ; if (fp->_fileno >= 0 && __builtin_expect (_IO_SYSSTAT (fp, &st), 0) >= 0) { diff --git a/libio/wfiledoalloc.c b/libio/wfiledoalloc.c index 28c10b6d0d..333b03635b 100644 --- a/libio/wfiledoalloc.c +++ b/libio/wfiledoalloc.c @@ -55,28 +55,10 @@ /* Modified for GNU iostream by Per Bothner 1991, 1992. */ -#ifndef _POSIX_SOURCE -# define _POSIX_SOURCE -#endif #include "libioP.h" -#include <sys/types.h> -#include <sys/stat.h> #include <stdlib.h> -#include <unistd.h> - -#ifdef _LIBC -# undef isatty -# define isatty(Fd) __isatty (Fd) -#endif - -/* - * Allocate a file buffer, or switch to unbuffered I/O. - * Per the ANSI C standard, ALL tty devices default to line buffered. - * - * As a side effect, we set __SOPT or __SNPT (en/dis-able fseek - * optimisation) right after the _fstat() that finds the buffer size. - */ +/* Allocate a file buffer, or switch to unbuffered I/O. */ int _IO_wfile_doallocate (_IO_FILE *fp) { |