aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Jaeger <aj@suse.de>2000-12-13 10:56:28 +0000
committerAndreas Jaeger <aj@suse.de>2000-12-13 10:56:28 +0000
commitb71f84a07f7210c98feebcc06bbddde07a83978f (patch)
treefb9a3650bd683fb5902e251af163aad93411d0e7
parent13193a3837bad23c0535f8bfc4cdedb96b70625f (diff)
downloadglibc-b71f84a07f7210c98feebcc06bbddde07a83978f.zip
glibc-b71f84a07f7210c98feebcc06bbddde07a83978f.tar.gz
glibc-b71f84a07f7210c98feebcc06bbddde07a83978f.tar.bz2
Update.
* manual/message.texi (Using gettextized software): Fix typo. * manual/charset.texi (Converting a Character): Fix mbstouwcs program to compile. Patch by Martin Buchholz <martin@xemacs.org>.
-rw-r--r--ChangeLog6
-rw-r--r--manual/charset.texi3
-rw-r--r--manual/message.texi2
3 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index ed46627..89fab38 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2000-12-13 Andreas Jaeger <aj@suse.de>
+ * manual/message.texi (Using gettextized software): Fix typo.
+
+ * manual/charset.texi (Converting a Character): Fix mbstouwcs
+ program to compile.
+ Patch by Martin Buchholz <martin@xemacs.org>.
+
* sysdeps/unix/sysv/linux/sigpending.c (sigpending): Fix typo.
Reported by Michael Kerrisk <mtk16@ext.canterbury.ac.nz>.
diff --git a/manual/charset.texi b/manual/charset.texi
index 227dcc1..aaf379d 100644
--- a/manual/charset.texi
+++ b/manual/charset.texi
@@ -688,8 +688,9 @@ mbstouwcs (const char *s)
wchar_t *wcp = result;
wchar_t tmp[1];
mbstate_t state;
- memset (&state, '\0', sizeof (state));
size_t nbytes;
+
+ memset (&state, '\0', sizeof (state));
while ((nbytes = mbrtowc (tmp, s, len, &state)) > 0)
@{
if (nbytes >= (size_t) -2)
diff --git a/manual/message.texi b/manual/message.texi
index f80b812..5f57be7 100644
--- a/manual/message.texi
+++ b/manual/message.texi
@@ -1669,7 +1669,7 @@ of the environment variable. It can split the value is different pieces
and by leaving out the only or the other part it can construct new
values. This happens of course in a predictable way. To understand
this one must know the format of the environment variable value. There
-are to more or less standardized forms:
+are two more or less standardized forms:
@table @emph
@item X/Open Format