diff options
| author | Andreas Schwab <aschwab@redhat.com> | 2009-06-10 14:04:22 +0200 |
|---|---|---|
| committer | Andreas Schwab <aschwab@redhat.com> | 2009-06-10 14:04:22 +0200 |
| commit | 0d02cb10e8dd8639b86450cf8e597cf5e2e09894 (patch) | |
| tree | 0f2174db43a501b946f0600d1b91ae4117977b04 /libio | |
| parent | dfbbe67270efa9c03f9444d50d2f98a7a64622b4 (diff) | |
| parent | 88ea382fda5af7717f85bb19837c9c99094f3df4 (diff) | |
Merge commit 'origin/master' into fedora/master
Conflicts:
ChangeLog
sysdeps/unix/sysv/linux/i386/sysconf.c
sysdeps/x86_64/cacheinfo.c
version.h
Diffstat (limited to 'libio')
| -rw-r--r-- | libio/.cvsignore | 8 | ||||
| -rw-r--r-- | libio/fileops.c | 6 |
2 files changed, 3 insertions, 11 deletions
diff --git a/libio/.cvsignore b/libio/.cvsignore deleted file mode 100644 index 602b74c1ae..0000000000 --- a/libio/.cvsignore +++ /dev/null @@ -1,8 +0,0 @@ -*.d *.o *.so *.po *.go stamp.* *.stamp *.ustamp *.udeps -*.gz *.Z *.tar *.tgz -=* -TODO COPYING* AUTHORS copyr-* copying.* -glibc-* - -mpn-copy.mk -distinfo diff --git a/libio/fileops.c b/libio/fileops.c index cf47c915a7..4698953f7a 100644 --- a/libio/fileops.c +++ b/libio/fileops.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1993, 1995, 1997-2005, 2006, 2007, 2008 +/* Copyright (C) 1993, 1995, 1997-2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. This file is part of the GNU C Library. Written by Per Bothner <bothner@cygnus.com>. @@ -319,11 +319,11 @@ _IO_new_file_fopen (fp, filename, mode, is32not64) continue; case 'c': fp->_flags2 |= _IO_FLAGS2_NOTCANCEL; - break; + continue; #ifdef O_CLOEXEC case 'e': oflags |= O_CLOEXEC; - break; + continue; #endif default: /* Ignore. */ |