aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2018-04-05 12:50:58 +0200
committerFlorian Weimer <fweimer@redhat.com>2018-04-05 12:50:58 +0200
commit0f339252697e6dcfc9e00be6cd8272d4260b90d2 (patch)
tree144326a4f739b40245b99d80d7f33436e8bbc74c
parent08e92e2443a6ca4cfd45b87e22bef3454f369752 (diff)
downloadglibc-0f339252697e6dcfc9e00be6cd8272d4260b90d2.tar
glibc-0f339252697e6dcfc9e00be6cd8272d4260b90d2.tar.gz
glibc-0f339252697e6dcfc9e00be6cd8272d4260b90d2.tar.bz2
glibc-0f339252697e6dcfc9e00be6cd8272d4260b90d2.zip
manual: Move mbstouwcs to an example C file
-rw-r--r--ChangeLog5
-rw-r--r--manual/charset.texi23
-rw-r--r--manual/examples/mbstouwcs.c28
3 files changed, 34 insertions, 22 deletions
diff --git a/ChangeLog b/ChangeLog
index af6e325aaa..9b30d0ce3b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2018-04-05 Florian Weimer <fweimer@redhat.com>
+
+ * manual/examples/mbstouwcs.c: New file.
+ * manual/charset.texi (Converting a Character): Include it.
+
2018-04-05 Samuel Thibault <samuel.thibault@ens-lyon.org>
* include/dirent.h (dirfd): Add hidden proto.
diff --git a/manual/charset.texi b/manual/charset.texi
index 1867ace485..6831ebec27 100644
--- a/manual/charset.texi
+++ b/manual/charset.texi
@@ -686,28 +686,7 @@ converting all lowercase characters into uppercase could look like this
checking, and sometimes leaks memory):
@smallexample
-wchar_t *
-mbstouwcs (const char *s)
-@{
- size_t len = strlen (s);
- wchar_t *result = malloc ((len + 1) * sizeof (wchar_t));
- wchar_t *wcp = result;
- wchar_t tmp[1];
- mbstate_t state;
- size_t nbytes;
-
- memset (&state, '\0', sizeof (state));
- while ((nbytes = mbrtowc (tmp, s, len, &state)) > 0)
- @{
- if (nbytes >= (size_t) -2)
- /* Invalid input string. */
- return NULL;
- *wcp++ = towupper (tmp[0]);
- len -= nbytes;
- s += nbytes;
- @}
- return result;
-@}
+@include mbstouwcs.c.texi
@end smallexample
The use of @code{mbrtowc} should be clear. A single wide character is
diff --git a/manual/examples/mbstouwcs.c b/manual/examples/mbstouwcs.c
new file mode 100644
index 0000000000..5d223da2ae
--- /dev/null
+++ b/manual/examples/mbstouwcs.c
@@ -0,0 +1,28 @@
+#include <stdlib.h>
+#include <string.h>
+#include <wchar.h>
+
+/* Do not include the above headers in the example.
+*/
+wchar_t *
+mbstouwcs (const char *s)
+{
+ size_t len = strlen (s);
+ wchar_t *result = malloc ((len + 1) * sizeof (wchar_t));
+ wchar_t *wcp = result;
+ wchar_t tmp[1];
+ mbstate_t state;
+ size_t nbytes;
+
+ memset (&state, '\0', sizeof (state));
+ while ((nbytes = mbrtowc (tmp, s, len, &state)) > 0)
+ {
+ if (nbytes >= (size_t) -2)
+ /* Invalid input string. */
+ return NULL;
+ *wcp++ = towupper (tmp[0]);
+ len -= nbytes;
+ s += nbytes;
+ }
+ return result;
+}