From d0b85c158fbe7a30d665f41c60bb5800da562ce8 Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Wed, 11 Mar 2009 11:53:22 +0000 Subject: * 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. --- newlib/libc/stdio/stdio.tex | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'newlib/libc/stdio/stdio.tex') diff --git a/newlib/libc/stdio/stdio.tex b/newlib/libc/stdio/stdio.tex index b3a69fc1d..28feffbcc 100644 --- a/newlib/libc/stdio/stdio.tex +++ b/newlib/libc/stdio/stdio.tex @@ -85,6 +85,7 @@ structure. * sprintf:: Write formatted output * sscanf:: Scan and format input * swprintf:: Write formatted wide character output +* swscanf:: Scan and format wide character input * tmpfile:: Create a temporary file * tmpnam:: Generate name for a temporary file * ungetc:: Push data back into a stream @@ -92,6 +93,7 @@ structure. * vfprintf:: Format variable argument list * vfscanf:: Scan variable argument list * vfwprintf:: Format variable wide character argument list +* vfwscanf:: Scan and format argument list from wide character input * viprintf:: Format variable argument list (integer only) * viscanf:: Scan variable format list (integer only) @end menu @@ -279,6 +281,9 @@ structure. @page @include stdio/swprintf.def +@page +@include stdio/swscanf.def + @page @include stdio/tmpfile.def @@ -300,6 +305,9 @@ structure. @page @include stdio/vfwprintf.def +@page +@include stdio/vfwscanf.def + @page @include stdio/viprintf.def -- cgit v1.2.3