diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2009-03-11 11:53:22 +0000 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2009-03-11 11:53:22 +0000 |
| commit | d0b85c158fbe7a30d665f41c60bb5800da562ce8 (patch) | |
| tree | 0a6bdcb338566b97077e802d1515f583d02f3cf7 /newlib/libc/include/wchar.h | |
| parent | e20efdda164c04d8e6731db0aed019a110699b1b (diff) | |
| download | cygnal-d0b85c158fbe7a30d665f41c60bb5800da562ce8.tar.gz cygnal-d0b85c158fbe7a30d665f41c60bb5800da562ce8.tar.bz2 cygnal-d0b85c158fbe7a30d665f41c60bb5800da562ce8.zip | |
* libc/include/wchar.h (fwscanf, swscanf, vfwscanf, vswscanf, vwscanf,
wscanf): Declare.
(_fwscanf_r, _swscanf_r, _vfwscanf_r, _vswscanf_r, _vwscanf_r,
_wscanf_r): Declare.
* libc/stdio/Makefile.am: Add new wscanf files.
* libc/stdio/Makefile.in: Regenerate.
* libc/stdio/fwscanf.c: New file.
* libc/stdio/local.h (__svfwscanf_r, __ssvfwscanf_r, __svfiwscanf_r,
__ssvfiwscanf_r): Declare.
* libc/stdio/stdio.tex: Add new documentation references.
* libc/stdio/swscanf.c: New file.
* libc/stdio/vfwscanf.c: New file.
* libc/stdio/vswscanf.c: New file.
* libc/stdio/vwscanf.c: New file.
* libc/stdio/wscanf.c: New file.
* libc/stdio/vfscanf.c (_sungetc_r): Make externaly available. Only
define if INTEGER_ONLY is defined. Declare otherwise.
(__ssrefill_r): Ditto.
(_sfread_r): Ditto.
Remove static eofread/eofread1 functions and use __seofread
function instead, throughout.
* libc/stdio/local.h (__seofread): Declare.
* libc/stdio/stdio.c (__seofread): Define.
* libc/stdio/fgetwc.c (__fgetwc): Fix compiler warning.
* libc/stdio/fgetws.c (_fgetws_r): Ditto.
* libc/stdio/fread.c (_fread_r): Ditto.
* libc/stdio/vfprintf.c: Ditto.
* libc/stdio/vswprintf.c: Ditto.
Diffstat (limited to 'newlib/libc/include/wchar.h')
| -rw-r--r-- | newlib/libc/include/wchar.h | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/newlib/libc/include/wchar.h b/newlib/libc/include/wchar.h index bce08bac0..133af8c98 100644 --- a/newlib/libc/include/wchar.h +++ b/newlib/libc/include/wchar.h @@ -155,6 +155,20 @@ int _EXFUN(_vswprintf_r, (struct _reent *, wchar_t *, size_t, const wchar_t *, _ int _EXFUN(_vwprintf_r, (struct _reent *, const wchar_t *, __VALIST)); int _EXFUN(_wprintf_r, (struct _reent *, const wchar_t *, ...)); +int _EXFUN(fwscanf, (__FILE *, const wchar_t *, ...)); +int _EXFUN(swscanf, (const wchar_t *, const wchar_t *, ...)); +int _EXFUN(vfwscanf, (__FILE *, const wchar_t *, __VALIST)); +int _EXFUN(vswscanf, (const wchar_t *, const wchar_t *, __VALIST)); +int _EXFUN(vwscanf, (const wchar_t *, __VALIST)); +int _EXFUN(wscanf, (const wchar_t *, ...)); + +int _EXFUN(_fwscanf_r, (struct _reent *, __FILE *, const wchar_t *, ...)); +int _EXFUN(_swscanf_r, (struct _reent *, const wchar_t *, const wchar_t *, ...)); +int _EXFUN(_vfwscanf_r, (struct _reent *, __FILE *, const wchar_t *, __VALIST)); +int _EXFUN(_vswscanf_r, (struct _reent *, const wchar_t *, const wchar_t *, __VALIST)); +int _EXFUN(_vwscanf_r, (struct _reent *, const wchar_t *, __VALIST)); +int _EXFUN(_wscanf_r, (struct _reent *, const wchar_t *, ...)); + #define getwc(fp) fgetwc(fp) #define putwc(wc,fp) fputwc((wc), (fp)) #ifndef _REENT_ONLY |