diff options
| author | Zack Weinberg <zackw@panix.com> | 2018-03-07 14:31:59 -0500 |
|---|---|---|
| committer | Gabriel F. T. Gomes <gabriel@inconstante.eti.br> | 2018-12-05 18:15:42 -0200 |
| commit | b87eb3f8feb826ac48463f598fc10476055bee5a (patch) | |
| tree | f71f60fbd1a5340ca8d2a9015c813b04cf053036 /libio | |
| parent | 349718d4d7841df46bcc36df9bc2baef4c40d6f5 (diff) | |
| download | glibc-b87eb3f8feb826ac48463f598fc10476055bee5a.tar.gz glibc-b87eb3f8feb826ac48463f598fc10476055bee5a.tar.xz glibc-b87eb3f8feb826ac48463f598fc10476055bee5a.zip | |
Use SCANF_ISOC99_A instead of _IO_FLAGS2_SCANF_STD.
Change the callers of __vfscanf_internal and __vfwscanf_internal that want C99-compliant behavior to communicate this via the new flags argument, rather than setting bits on the FILE object. This also means these functions do not need to do their own locking. Tested for powerpc and powerpc64le.
Diffstat (limited to 'libio')
| -rw-r--r-- | libio/libio.h | 1 | ||||
| -rw-r--r-- | libio/libioP.h | 5 |
2 files changed, 2 insertions, 4 deletions
diff --git a/libio/libio.h b/libio/libio.h index d4eba2df54..30cb7d784f 100644 --- a/libio/libio.h +++ b/libio/libio.h @@ -92,7 +92,6 @@ typedef union #define _IO_FLAGS2_NOTCANCEL 2 #define _IO_FLAGS2_FORTIFY 4 #define _IO_FLAGS2_USER_WBUF 8 -#define _IO_FLAGS2_SCANF_STD 16 #define _IO_FLAGS2_NOCLOSE 32 #define _IO_FLAGS2_CLOEXEC 64 #define _IO_FLAGS2_NEED_LOCK 128 diff --git a/libio/libioP.h b/libio/libioP.h index 525dce19ee..9e971cb96b 100644 --- a/libio/libioP.h +++ b/libio/libioP.h @@ -786,7 +786,7 @@ __attribute__ ((__always_inline__)) _IO_acquire_lock_clear_flags2_fct (FILE **p) { FILE *fp = *p; - fp->_flags2 &= ~(_IO_FLAGS2_FORTIFY | _IO_FLAGS2_SCANF_STD); + fp->_flags2 &= ~(_IO_FLAGS2_FORTIFY); if ((fp->_flags & _IO_USER_LOCK) == 0) _IO_funlockfile (fp); } @@ -800,8 +800,7 @@ _IO_acquire_lock_clear_flags2_fct (FILE **p) FILE *_IO_acquire_lock_file = (_fp) # define _IO_release_lock(_fp) \ if (_IO_acquire_lock_file != NULL) \ - _IO_acquire_lock_file->_flags2 &= ~(_IO_FLAGS2_FORTIFY \ - | _IO_FLAGS2_SCANF_STD); \ + _IO_acquire_lock_file->_flags2 &= ~(_IO_FLAGS2_FORTIFY); \ } while (0) #endif |