summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCorinna Vinschen <corinna@vinschen.de>2009-03-12 14:30:28 +0000
committerCorinna Vinschen <corinna@vinschen.de>2009-03-12 14:30:28 +0000
commit14a164a726b944cb6f2963721b01d5a593dd7398 (patch)
treee0ecb225086c96d9030321d599389fca58ecfc2a
parent4a825d4145f7a4d409f355b478781fa6742fabbf (diff)
downloadcygnal-14a164a726b944cb6f2963721b01d5a593dd7398.tar.gz
cygnal-14a164a726b944cb6f2963721b01d5a593dd7398.tar.bz2
cygnal-14a164a726b944cb6f2963721b01d5a593dd7398.zip
* libc/stdio/swscanf.c: Some documentation corrections.
-rw-r--r--newlib/ChangeLog6
-rw-r--r--newlib/libc/stdio/swscanf.c7
2 files changed, 10 insertions, 3 deletions
diff --git a/newlib/ChangeLog b/newlib/ChangeLog
index 9aeac02d3..426eb7071 100644
--- a/newlib/ChangeLog
+++ b/newlib/ChangeLog
@@ -1,4 +1,8 @@
-2009-03-09 Craig Howland <howland@LGSInnovations.com>
+2009-03-12 Craig Howland <howland@LGSInnovations.com>
+
+ * libc/stdio/swscanf.c: Some documentation corrections.
+
+2009-03-12 Craig Howland <howland@LGSInnovations.com>
* libc/stdio/swprintf.c (_swprintf_r, swprintf):
correct how terminating L'\0' is added;
diff --git a/newlib/libc/stdio/swscanf.c b/newlib/libc/stdio/swscanf.c
index e4e251f95..273f59b32 100644
--- a/newlib/libc/stdio/swscanf.c
+++ b/newlib/libc/stdio/swscanf.c
@@ -229,7 +229,9 @@ DESCRIPTION
enough to accept the sequence and a
terminating null character which will be added
automatically. (<[pattern]> is discussed in the paragraph following
- this table). Corresponding <[arg]>: <<(char *arg)>>.
+ this table). Corresponding <[arg]>: <<(char *arg)>>.
+ If an <<l>> specifier is present, the corresponding <[arg]> is
+ a <<(wchar_t *arg)>>.
o d
Reads a decimal integer into the corresponding <[arg]>: <<(int *arg)>>.
@@ -280,7 +282,7 @@ DESCRIPTION
Here are some <[pattern]> examples:
o+
o %[abcd]
- matches wide wide character strings containing only
+ matches wide character strings containing only
<<a>>, <<b>>, <<c>>, and <<d>>.
o %[^abcd]
@@ -290,6 +292,7 @@ DESCRIPTION
o %[A-DW-Z]
Note: No wide character ranges, so this expression matches wide
character strings containing <<A>>, <<->>, <<D>>, <<W>>, <<Z>>.
+ o-
Floating point numbers (for field types <<e>>, <<f>>, <<g>>, <<E>>,
<<F>>, <<G>>) must correspond to the following general form: