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/oldiofclose.c | |
parent | 6c29942cbf059aca47fd4bbd852ea42c9d46b71f (diff) | |
download | glibc-a5406364ac949f91867352cb2ae867629f083c5b.tar.gz glibc-a5406364ac949f91867352cb2ae867629f083c5b.tar.xz 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/oldiofclose.c')
-rw-r--r-- | libio/oldiofclose.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/libio/oldiofclose.c b/libio/oldiofclose.c index e4cbf88566..be5044c3bd 100644 --- a/libio/oldiofclose.c +++ b/libio/oldiofclose.c @@ -58,12 +58,7 @@ _IO_old_fclose (FILE *fp) _IO_FINISH (fp); if (_IO_have_backup (fp)) _IO_free_backup_area (fp); - if (fp != _IO_stdin && fp != _IO_stdout && fp != _IO_stderr) - { - fp->_flags = 0; - free(fp); - } - + _IO_deallocate_file (fp); return status; } |