JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* libc/stdio/fscanf.c (fscanf): Call _vfscanf_r instead of __svfscanf_r

Browse Source 
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.
This commit is contained in:
Corinna Vinschen 2011-07-15 08:04:17 +00:00
parent 27a249f513
commit c842ff73e7
5 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
newlib/ChangeLog
View File

@ -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> 2011-07-13 Hans-Peter Nilsson <hp@axis.com>
* libm/complex/cacos.c: Use temporaries and correct sequencing * libm/complex/cacos.c: Use temporaries and correct sequencing

4
newlib/libc/stdio/fscanf.c
View File

@ -45,7 +45,7 @@ fscanf(FILE *fp, fmt, va_alist)
#else #else
va_start (ap); va_start (ap);
#endif #endif
ret = __svfscanf_r (_REENT, fp, fmt, ap); ret = _vfscanf_r (_REENT, fp, fmt, ap);
va_end (ap); va_end (ap);
return ret; return ret;
} }
@ -71,7 +71,7 @@ _fscanf_r(ptr, FILE *fp, fmt, va_alist)
#else #else
va_start (ap); va_start (ap);
#endif #endif
ret = __svfscanf_r (ptr, fp, fmt, ap); ret = _vfscanf_r (ptr, fp, fmt, ap);
va_end (ap); va_end (ap);
return (ret); return (ret);
} }

4
newlib/libc/stdio/fwscanf.c
View File

@ -31,7 +31,7 @@ fwscanf (FILE *fp, _CONST wchar_t *fmt, ...)
va_list ap; va_list ap;
va_start (ap, fmt); va_start (ap, fmt);
ret = __svfwscanf_r (_REENT, fp, fmt, ap); ret = _vfwscanf_r (_REENT, fp, fmt, ap);
va_end (ap); va_end (ap);
return ret; return ret;
} }
@ -45,7 +45,7 @@ _fwscanf_r (struct _reent *ptr, FILE *fp, _CONST wchar_t *fmt, ...)
va_list ap; va_list ap;
va_start (ap, fmt); va_start (ap, fmt);
ret = __svfwscanf_r (ptr, fp, fmt, ap); ret = _vfwscanf_r (ptr, fp, fmt, ap);
va_end (ap); va_end (ap);
return (ret); return (ret);
} }

4
newlib/libc/stdio/scanf.c
View File

@ -45,7 +45,7 @@ scanf(fmt, va_alist)
#else #else
va_start (ap); va_start (ap);
#endif #endif
ret = __svfscanf_r (_REENT, _stdin_r (_REENT), fmt, ap); ret = _vfscanf_r (_REENT, _stdin_r (_REENT), fmt, ap);
va_end (ap); va_end (ap);
return ret; return ret;
} }
@ -71,7 +71,7 @@ _scanf_r(ptr, fmt, va_alist)
#else #else
va_start (ap); va_start (ap);
#endif #endif
ret = __svfscanf_r (ptr, _stdin_r (ptr), fmt, ap); ret = _vfscanf_r (ptr, _stdin_r (ptr), fmt, ap);
va_end (ap); va_end (ap);
return (ret); return (ret);
} }

4
newlib/libc/stdio/wscanf.c
View File

@ -32,7 +32,7 @@ wscanf(_CONST wchar_t *fmt, ...)
_REENT_SMALL_CHECK_INIT (_REENT); _REENT_SMALL_CHECK_INIT (_REENT);
va_start (ap, fmt); 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); va_end (ap);
return ret; return ret;
} }
@ -47,7 +47,7 @@ _wscanf_r(struct _reent *ptr, _CONST wchar_t *fmt, ...)
_REENT_SMALL_CHECK_INIT (ptr); _REENT_SMALL_CHECK_INIT (ptr);
va_start (ap, fmt); 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); va_end (ap);
return (ret); return (ret);
} }