diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2011-07-15 12:04:17 +0400 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2011-07-15 12:04:17 +0400 |
| commit | c842ff73e769b4c35007c866778be0b3840160fe (patch) | |
| tree | f74608191682e08dcdf4f901356799b63f8ceb94 /newlib | |
| parent | 27a249f5138001eeaf232580235d83ef956cfc76 (diff) | |
* libc/stdio/fscanf.c (fscanf): Call _vfscanf_r instead of __svfscanf_r
to make sure CHECK_INIT is called.
(_fscanf_r): Ditto.
* /libc/stdio/scanf.c (scanf): Ditto.
(_scanf_r): Ditto.
* libc/stdio/fwscanf.c (fwscanf): Call _vfwscanf_r instead of
__svfwscanf_r to make sure CHECK_INIT is called.
(_fwscanf_r): Ditto.
* libc/stdio/wscanf.c (wscanf): Ditto.
(_wscanf_r): Ditto.
Diffstat (limited to 'newlib')
| -rw-r--r-- | newlib/ChangeLog | 13 | ||||
| -rw-r--r-- | newlib/libc/stdio/fscanf.c | 4 | ||||
| -rw-r--r-- | newlib/libc/stdio/fwscanf.c | 4 | ||||
| -rw-r--r-- | newlib/libc/stdio/scanf.c | 4 | ||||
| -rw-r--r-- | newlib/libc/stdio/wscanf.c | 4 |
5 files changed, 21 insertions, 8 deletions
diff --git a/newlib/ChangeLog b/newlib/ChangeLog index 8a986faf4..6cfa9fb27 100644 --- a/newlib/ChangeLog +++ b/newlib/ChangeLog @@ -1,3 +1,16 @@ +2011-07-15 Matt Johnson <johnso87@crhc.illinois.edu> + + * libc/stdio/fscanf.c (fscanf): Call _vfscanf_r instead of __svfscanf_r + to make sure CHECK_INIT is called. + (_fscanf_r): Ditto. + * /libc/stdio/scanf.c (scanf): Ditto. + (_scanf_r): Ditto. + * libc/stdio/fwscanf.c (fwscanf): Call _vfwscanf_r instead of + __svfwscanf_r to make sure CHECK_INIT is called. + (_fwscanf_r): Ditto. + * libc/stdio/wscanf.c (wscanf): Ditto. + (_wscanf_r): Ditto. + 2011-07-13 Hans-Peter Nilsson <hp@axis.com> * libm/complex/cacos.c: Use temporaries and correct sequencing diff --git a/newlib/libc/stdio/fscanf.c b/newlib/libc/stdio/fscanf.c index c00a4690e..afbc2f0e8 100644 --- a/newlib/libc/stdio/fscanf.c +++ b/newlib/libc/stdio/fscanf.c @@ -45,7 +45,7 @@ fscanf(FILE *fp, fmt, va_alist) #else va_start (ap); #endif - ret = __svfscanf_r (_REENT, fp, fmt, ap); + ret = _vfscanf_r (_REENT, fp, fmt, ap); va_end (ap); return ret; } @@ -71,7 +71,7 @@ _fscanf_r(ptr, FILE *fp, fmt, va_alist) #else va_start (ap); #endif - ret = __svfscanf_r (ptr, fp, fmt, ap); + ret = _vfscanf_r (ptr, fp, fmt, ap); va_end (ap); return (ret); } diff --git a/newlib/libc/stdio/fwscanf.c b/newlib/libc/stdio/fwscanf.c index 8d5236edc..f013cb8f9 100644 --- a/newlib/libc/stdio/fwscanf.c +++ b/newlib/libc/stdio/fwscanf.c @@ -31,7 +31,7 @@ fwscanf (FILE *fp, _CONST wchar_t *fmt, ...) va_list ap; va_start (ap, fmt); - ret = __svfwscanf_r (_REENT, fp, fmt, ap); + ret = _vfwscanf_r (_REENT, fp, fmt, ap); va_end (ap); return ret; } @@ -45,7 +45,7 @@ _fwscanf_r (struct _reent *ptr, FILE *fp, _CONST wchar_t *fmt, ...) va_list ap; va_start (ap, fmt); - ret = __svfwscanf_r (ptr, fp, fmt, ap); + ret = _vfwscanf_r (ptr, fp, fmt, ap); va_end (ap); return (ret); } diff --git a/newlib/libc/stdio/scanf.c b/newlib/libc/stdio/scanf.c index cf1472ba7..68fd8fb65 100644 --- a/newlib/libc/stdio/scanf.c +++ b/newlib/libc/stdio/scanf.c @@ -45,7 +45,7 @@ scanf(fmt, va_alist) #else va_start (ap); #endif - ret = __svfscanf_r (_REENT, _stdin_r (_REENT), fmt, ap); + ret = _vfscanf_r (_REENT, _stdin_r (_REENT), fmt, ap); va_end (ap); return ret; } @@ -71,7 +71,7 @@ _scanf_r(ptr, fmt, va_alist) #else va_start (ap); #endif - ret = __svfscanf_r (ptr, _stdin_r (ptr), fmt, ap); + ret = _vfscanf_r (ptr, _stdin_r (ptr), fmt, ap); va_end (ap); return (ret); } diff --git a/newlib/libc/stdio/wscanf.c b/newlib/libc/stdio/wscanf.c index 671727425..abe8dc07a 100644 --- a/newlib/libc/stdio/wscanf.c +++ b/newlib/libc/stdio/wscanf.c @@ -32,7 +32,7 @@ wscanf(_CONST wchar_t *fmt, ...) _REENT_SMALL_CHECK_INIT (_REENT); va_start (ap, fmt); - ret = __svfwscanf_r (_REENT, _stdin_r (_REENT), fmt, ap); + ret = _vfwscanf_r (_REENT, _stdin_r (_REENT), fmt, ap); va_end (ap); return ret; } @@ -47,7 +47,7 @@ _wscanf_r(struct _reent *ptr, _CONST wchar_t *fmt, ...) _REENT_SMALL_CHECK_INIT (ptr); va_start (ap, fmt); - ret = __svfwscanf_r (ptr, _stdin_r (ptr), fmt, ap); + ret = _vfwscanf_r (ptr, _stdin_r (ptr), fmt, ap); va_end (ap); return (ret); } |