diff options
author | Jeff Johnston <jjohnstn@redhat.com> | 2004-09-17 01:30:51 +0400 |
---|---|---|
committer | Jeff Johnston <jjohnstn@redhat.com> | 2004-09-17 01:30:51 +0400 |
commit | ed6859b8f02e456699f85918e4b81457537900fa (patch) | |
tree | 301f85ef34f78d17a7497ae6d1807a6e25ccbca5 /newlib/libc/stdio | |
parent | 7a0f696676736d2d8b1d214f9f0cfa5ce8ce76c1 (diff) |
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')
-rw-r--r-- | newlib/libc/stdio/local.h | 10 | ||||
-rw-r--r-- | newlib/libc/stdio/siprintf.c | 2 | ||||
-rw-r--r-- | newlib/libc/stdio/snprintf.c | 2 | ||||
-rw-r--r-- | newlib/libc/stdio/sscanf.c | 6 | ||||
-rw-r--r-- | newlib/libc/stdio/vsnprintf.c | 2 | ||||
-rw-r--r-- | newlib/libc/stdio/vsscanf.c | 6 |
6 files changed, 18 insertions, 10 deletions
diff --git a/newlib/libc/stdio/local.h b/newlib/libc/stdio/local.h index e3d5da573..e62f3418d 100644 --- a/newlib/libc/stdio/local.h +++ b/newlib/libc/stdio/local.h @@ -48,11 +48,11 @@ extern int _EXFUN(__srefill,(FILE *fp)); /* Called by the main entry point fns to ensure stdio has been initialized. */ #define CHECK_INIT(fp) \ - do \ - { \ - if (!_REENT->__sdidinit) \ - __sinit (_REENT); \ - } \ + do \ + { \ + if (_REENT && !_REENT->__sdidinit) \ + __sinit (_REENT); \ + } \ while (0) /* Return true iff the given FILE cannot be written now. */ diff --git a/newlib/libc/stdio/siprintf.c b/newlib/libc/stdio/siprintf.c index 95ff8084f..838200805 100644 --- a/newlib/libc/stdio/siprintf.c +++ b/newlib/libc/stdio/siprintf.c @@ -85,6 +85,7 @@ siprintf(str, fmt, va_alist) f._flags = __SWR | __SSTR; f._bf._base = f._p = (unsigned char *) str; f._bf._size = f._w = INT_MAX; + f._file = -1; /* No file. */ #ifdef _HAVE_STDC va_start (ap, fmt); #else @@ -119,6 +120,7 @@ _siprintf_r(rptr, str, fmt, va_alist) f._flags = __SWR | __SSTR; f._bf._base = f._p = (unsigned char *) str; f._bf._size = f._w = INT_MAX; + f._file = -1; /* No file. */ #ifdef _HAVE_STDC va_start (ap, fmt); #else diff --git a/newlib/libc/stdio/snprintf.c b/newlib/libc/stdio/snprintf.c index fc818d2e9..9c5c7cbb4 100644 --- a/newlib/libc/stdio/snprintf.c +++ b/newlib/libc/stdio/snprintf.c @@ -51,6 +51,7 @@ _snprintf_r(ptr, str, size, fmt, va_alist) f._flags = __SWR | __SSTR; f._bf._base = f._p = (unsigned char *) str; f._bf._size = f._w = (size > 0 ? size - 1 : 0); + f._file = -1; /* No file. */ #ifdef _HAVE_STDC va_start (ap, fmt); #else @@ -86,6 +87,7 @@ snprintf(str, size, fmt, va_alist) f._flags = __SWR | __SSTR; f._bf._base = f._p = (unsigned char *) str; f._bf._size = f._w = (size > 0 ? size - 1 : 0); + f._file = -1; /* No file. */ #ifdef _HAVE_STDC va_start (ap, fmt); #else diff --git a/newlib/libc/stdio/sscanf.c b/newlib/libc/stdio/sscanf.c index 1aca40507..687f53edf 100644 --- a/newlib/libc/stdio/sscanf.c +++ b/newlib/libc/stdio/sscanf.c @@ -402,12 +402,13 @@ sscanf(str, fmt, va_alist) va_list 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 = eofread; f._ub._base = NULL; f._lb._base = NULL; + f._file = -1; /* No file. */ #ifdef _HAVE_STDC va_start (ap, fmt); #else @@ -439,12 +440,13 @@ _sscanf_r(ptr, str, fmt, va_alist) va_list 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 = eofread; f._ub._base = NULL; f._lb._base = NULL; + f._file = -1; /* No file. */ #ifdef _HAVE_STDC va_start (ap, fmt); #else diff --git a/newlib/libc/stdio/vsnprintf.c b/newlib/libc/stdio/vsnprintf.c index fb80f4192..9fc1b2d89 100644 --- a/newlib/libc/stdio/vsnprintf.c +++ b/newlib/libc/stdio/vsnprintf.c @@ -45,6 +45,7 @@ _DEFUN(vsnprintf, (str, size, fmt, ap), f._flags = __SWR | __SSTR; f._bf._base = f._p = (unsigned char *) str; f._bf._size = f._w = (size > 0 ? size - 1 : 0); + f._file = -1; /* No file. */ ret = _vfprintf_r (_REENT, &f, fmt, ap); if (size > 0) *f._p = 0; @@ -67,6 +68,7 @@ _DEFUN(_vsnprintf_r, (ptr, str, size, fmt, ap), f._flags = __SWR | __SSTR; f._bf._base = f._p = (unsigned char *) str; f._bf._size = f._w = (size > 0 ? size - 1 : 0); + f._file = -1; /* No file. */ ret = _vfprintf_r (ptr, &f, fmt, ap); if (size > 0) *f._p = 0; 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); } - |