diff options
| author | Roland McGrath <roland@hack.frob.com> | 2015-03-23 13:46:36 -0700 |
|---|---|---|
| committer | Roland McGrath <roland@hack.frob.com> | 2015-03-23 13:46:36 -0700 |
| commit | 7e9c7b9b689d9d8f24a4a7f9723f0290c0cbdbd0 (patch) | |
| tree | b6057bdf2c660bbce0c9a7095a30b58c275e1e6b | |
| parent | 98734cc50153c80047f4ed9c6772bc7e1e68c9f7 (diff) | |
| download | glibc-7e9c7b9b689d9d8f24a4a7f9723f0290c0cbdbd0.tar.gz glibc-7e9c7b9b689d9d8f24a4a7f9723f0290c0cbdbd0.tar.xz glibc-7e9c7b9b689d9d8f24a4a7f9723f0290c0cbdbd0.zip | |
Minor cleanups in libio/iofdopen.c
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | libio/iofdopen.c | 13 |
2 files changed, 11 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog index 5686701994..b0a17b0634 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2015-03-23 Roland McGrath <roland@hack.frob.com> + + * libio/iofdopen.c: Move FD_FLAGS declaration into its first use, + inside [F_GETFL]. Remove POSIX_MODE local variable, just test the + _IO_IS_APPENDING bit in READ_WRITE instead. + 2015-03-23 Florian Weimer <fweimer@redhat.com> * sysdeps/unix/sysv/linux/pthread_setaffinity.c diff --git a/libio/iofdopen.c b/libio/iofdopen.c index 411b6893b1..e7d84ae983 100644 --- a/libio/iofdopen.c +++ b/libio/iofdopen.c @@ -46,7 +46,6 @@ _IO_new_fdopen (fd, mode) const char *mode; { int read_write; - int posix_mode = 0; struct locked_FILE { struct _IO_FILE_plus fp; @@ -55,7 +54,6 @@ _IO_new_fdopen (fd, mode) #endif struct _IO_wide_data wd; } *new_f; - int fd_flags; int i; int use_mmap = 0; @@ -73,7 +71,6 @@ _IO_new_fdopen (fd, mode) read_write = _IO_NO_READS; break; case 'a': - posix_mode = O_APPEND; read_write = _IO_NO_READS|_IO_IS_APPENDING; break; default: @@ -101,7 +98,7 @@ _IO_new_fdopen (fd, mode) break; } #ifdef F_GETFL - fd_flags = _IO_fcntl (fd, F_GETFL); + int fd_flags = _IO_fcntl (fd, F_GETFL); #ifndef O_ACCMODE #define O_ACCMODE (O_RDONLY|O_WRONLY|O_RDWR) #endif @@ -120,9 +117,9 @@ _IO_new_fdopen (fd, mode) Realtime Extensions], Rationale B.8.3.3 Open a Stream on a File Descriptor says: - Although not explicitly required by POSIX.1, a good - implementation of append ("a") mode would cause the - O_APPEND flag to be set. + Although not explicitly required by POSIX.1, a good + implementation of append ("a") mode would cause the + O_APPEND flag to be set. (Historical implementations [such as Solaris2] do a one-time seek in fdopen.) @@ -131,7 +128,7 @@ _IO_new_fdopen (fd, mode) though that would seem consistent) because that would be more likely to break historical programs. */ - if ((posix_mode & O_APPEND) && !(fd_flags & O_APPEND)) + if ((read_write & _IO_IS_APPENDING) && !(fd_flags & O_APPEND)) { do_seek = true; #ifdef F_SETFL |