diff options
Diffstat (limited to 'libio')
| -rw-r--r-- | libio/iofdopen.c | 7 | ||||
| -rw-r--r-- | libio/iofopncook.c | 7 | ||||
| -rw-r--r-- | libio/iovdprintf.c | 8 | ||||
| -rw-r--r-- | libio/oldiofdopen.c | 5 |
4 files changed, 12 insertions, 15 deletions
diff --git a/libio/iofdopen.c b/libio/iofdopen.c index 0c449ed..7f6e593 100644 --- a/libio/iofdopen.c +++ b/libio/iofdopen.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1993,1994,1997,1998,1999,2000,2002,2003 +/* Copyright (C) 1993,1994,1997,1998,1999,2000,2002,2003,2010 Free Software Foundation, Inc. This file is part of the GNU C Library. @@ -172,9 +172,8 @@ _IO_new_fdopen (fd, mode) } new_f->fp.file._flags &= ~_IO_DELETE_DONT_CLOSE; - new_f->fp.file._IO_file_flags = - _IO_mask_flags (&new_f->fp.file, read_write, - _IO_NO_READS+_IO_NO_WRITES+_IO_IS_APPENDING); + _IO_mask_flags (&new_f->fp.file, read_write, + _IO_NO_READS+_IO_NO_WRITES+_IO_IS_APPENDING); return &new_f->fp.file; } diff --git a/libio/iofopncook.c b/libio/iofopncook.c index 976ff50..f36e4c7 100644 --- a/libio/iofopncook.c +++ b/libio/iofopncook.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1993,95,97,99,2000,2002,2004, 2005 +/* Copyright (C) 1993,95,97,99,2000,2002,2004, 2005, 2010 Free Software Foundation, Inc. This file is part of the GNU C Library. @@ -154,9 +154,8 @@ _IO_cookie_init (struct _IO_cookie_file *cfile, int read_write, INTUSE(_IO_file_init) (&cfile->__fp); - cfile->__fp.file._IO_file_flags = - _IO_mask_flags (&cfile->__fp.file, read_write, - _IO_NO_READS+_IO_NO_WRITES+_IO_IS_APPENDING); + _IO_mask_flags (&cfile->__fp.file, read_write, + _IO_NO_READS+_IO_NO_WRITES+_IO_IS_APPENDING); /* We use a negative number different from -1 for _fileno to mark that this special stream is not associated with a real file, but still has diff --git a/libio/iovdprintf.c b/libio/iovdprintf.c index 5284ff8..fb4a838 100644 --- a/libio/iovdprintf.c +++ b/libio/iovdprintf.c @@ -53,10 +53,10 @@ _IO_vdprintf (d, format, arg) INTUSE(_IO_un_link) (&tmpfil); return EOF; } - tmpfil.file._IO_file_flags = - (_IO_mask_flags (&tmpfil.file, _IO_NO_READS, - _IO_NO_READS+_IO_NO_WRITES+_IO_IS_APPENDING) - | _IO_DELETE_DONT_CLOSE); + tmpfil.file._flags |= _IO_DELETE_DONT_CLOSE; + + _IO_mask_flags (&tmpfil.file, _IO_NO_READS, + _IO_NO_READS+_IO_NO_WRITES+_IO_IS_APPENDING); done = INTUSE(_IO_vfprintf) (&tmpfil.file, format, arg); diff --git a/libio/oldiofdopen.c b/libio/oldiofdopen.c index c616b38..a1fc667 100644 --- a/libio/oldiofdopen.c +++ b/libio/oldiofdopen.c @@ -130,9 +130,8 @@ _IO_old_fdopen (fd, mode) } new_f->fp.file._file._flags &= ~_IO_DELETE_DONT_CLOSE; - new_f->fp.file._file._IO_file_flags = - _IO_mask_flags (&new_f->fp.file._file, read_write, - _IO_NO_READS+_IO_NO_WRITES+_IO_IS_APPENDING); + _IO_mask_flags (&new_f->fp.file._file, read_write, + _IO_NO_READS+_IO_NO_WRITES+_IO_IS_APPENDING); return (_IO_FILE *) &new_f->fp; } |