diff options
| author | Jeff Johnston <jjohnstn@redhat.com> | 2004-09-16 21:30:51 +0000 |
|---|---|---|
| committer | Jeff Johnston <jjohnstn@redhat.com> | 2004-09-16 21:30:51 +0000 |
| commit | ed6859b8f02e456699f85918e4b81457537900fa (patch) | |
| tree | 301f85ef34f78d17a7497ae6d1807a6e25ccbca5 /newlib/libc/stdio/vsscanf.c | |
| parent | 7a0f696676736d2d8b1d214f9f0cfa5ce8ce76c1 (diff) | |
| download | cygnal-ed6859b8f02e456699f85918e4b81457537900fa.tar.gz cygnal-ed6859b8f02e456699f85918e4b81457537900fa.tar.bz2 cygnal-ed6859b8f02e456699f85918e4b81457537900fa.zip | |
2004-09-16 Antony King <antony.king@st.com>
* libc/include/sys/lock.h: Replaced empty {} with (0) to conform
with locking API.
* libc/include/sys/stdio.h: (_flockfile)[!_SINGLE_THREAD]: Add
check for__SSTR in _flags and if set, skip lock request.
(_funlockfile)[!SINGLE_THREAD]: Ditto.
* libc/stdio/local.h (CHECK_INIT): Added check that _REENT is
not NULL.
* libc/stdio/siprintf.c (siprintf, _siprintf_r): Added missing
initialisation of _file to -1 in local FILE.
* libc/stdio/snprintf.c (snprintf, _snprintf_r): Ditto.
* libc/stdio/sscanf.c (sscanf, _sscanf_r): Ditto.
* libc/stdio/vsnprintf.c (vsnprintf, _vsnprintf_r): Ditto.
* libc/stdio/vsscanf.c (_vsscanf_r): Ditto.
* libc/stdio/sscanf.c (sscanf, _sscanf_r): Added __SSTR flag to
_flags in local FILE to prevent locking.
* libc/stdio/vsscanf.c (_vsscanf_r): Ditto.
Diffstat (limited to 'newlib/libc/stdio/vsscanf.c')
| -rw-r--r-- | newlib/libc/stdio/vsscanf.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/newlib/libc/stdio/vsscanf.c b/newlib/libc/stdio/vsscanf.c index c6237112c..22ed9cdf7 100644 --- a/newlib/libc/stdio/vsscanf.c +++ b/newlib/libc/stdio/vsscanf.c @@ -63,12 +63,12 @@ _DEFUN(_vsscanf_r, (ptr, str, fmt, ap), { FILE f; - f._flags = __SRD; + f._flags = __SRD | __SSTR; f._bf._base = f._p = (unsigned char *) str; f._bf._size = f._r = strlen (str); f._read = eofread1; f._ub._base = NULL; f._lb._base = NULL; - return __svfscanf_r (ptr, &f, fmt, ap); + f._file = -1; /* No file. */ + return __svfscanf_r (ptr, &f, fmt, ap); } - |