[COMMITTED] Minor cleanups in libio/iofdopen.c
diff mbox

Message ID 20150323211525.B8D532C3B93@topped-with-meat.com
State New
Headers show

Commit Message

Roland McGrath March 23, 2015, 9:15 p.m. UTC
This fixes some -Werror unused variable warnings for the [!F_GETFL] case.
Tested x86_64-linux-gnu.


Thanks,
Roland


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.

Patch
diff mbox

--- 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
@@ -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