diff options
| author | Florian Weimer <fweimer@redhat.com> | 2019-02-18 11:49:54 +0100 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2019-02-18 16:37:00 +0100 |
| commit | a5406364ac949f91867352cb2ae867629f083c5b (patch) | |
| tree | 0aeeedc3748d3b21cf8e8ea2e670670df1e441db /libio/iofwide.c | |
| parent | 6c29942cbf059aca47fd4bbd852ea42c9d46b71f (diff) | |
| download | glibc-a5406364ac949f91867352cb2ae867629f083c5b.tar glibc-a5406364ac949f91867352cb2ae867629f083c5b.tar.gz glibc-a5406364ac949f91867352cb2ae867629f083c5b.tar.bz2 glibc-a5406364ac949f91867352cb2ae867629f083c5b.zip | |
libio: Eliminate _IO_stdin, _IO_stdout, _IO_stderr
These variables are only used to determine if a stdio stream is
a pre-allocated stream, but it is possible to do so by comparing
a FILE * to all pre-allocated stream objects. As a result, it is
not necessary to keep those pointers in separate variables.
Behavior with symbol interposition is unchanged because _IO_stdin_,
_IO_stdout_, _IO_stderr_ are exported, and refer to objects outside of
libc if symbol interposition or copy relocations are involved. (The
removed variables _IO_stdin, _IO_stdout, _IO_stderr were not exported,
of course.)
Diffstat (limited to 'libio/iofwide.c')
| -rw-r--r-- | libio/iofwide.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libio/iofwide.c b/libio/iofwide.c index 6676ad5e53..247cfde3d0 100644 --- a/libio/iofwide.c +++ b/libio/iofwide.c @@ -87,8 +87,7 @@ _IO_fwide (FILE *fp, int mode) mode = mode < 0 ? -1 : (mode == 0 ? 0 : 1); #if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_1) - if (__builtin_expect (&_IO_stdin_used == NULL, 0) - && (fp == _IO_stdin || fp == _IO_stdout || fp == _IO_stderr)) + if (__glibc_unlikely (&_IO_stdin_used == NULL) && _IO_legacy_file (fp)) /* This is for a stream in the glibc 2.0 format. */ return -1; #endif |