This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
[PATCH COMMITTED] libio: Clean up _IO_file_doallocate and _IO_wfile_doallocate
- From: Florian Weimer <fweimer at redhat dot com>
- To: GNU C Library <libc-alpha at sourceware dot org>
- Date: Mon, 7 Mar 2016 17:14:03 +0100
- Subject: [PATCH COMMITTED] libio: Clean up _IO_file_doallocate and _IO_wfile_doallocate
- Authentication-results: sourceware.org; auth=none
This is the non-controversial clean-up part of the patch discussed here:
<https://sourceware.org/ml/libc-alpha/2016-02/msg00839.html>
Florian
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.
diff --git a/libio/filedoalloc.c b/libio/filedoalloc.c
index b51e910..4f9d738 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 28c10b6..333b036 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)
{