[glib] Clarify documentation about g_convert() nul-terminated returns
- From: Benjamin Otte <otte src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [glib] Clarify documentation about g_convert() nul-terminated returns
- Date: Tue, 27 Oct 2009 20:37:49 +0000 (UTC)
commit 5a633f82dbbce067c56fba0ee372fd341b76368d
Author: Benjamin Otte <otte gnome org>
Date: Tue Oct 27 21:07:13 2009 +0100
Clarify documentation about g_convert() nul-terminated returns
THere is effectively no nul-termination for multibyte characters.
glib/gconvert.c | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 deletions(-)
---
diff --git a/glib/gconvert.c b/glib/gconvert.c
index 7a20cb5..f2141a3 100644
--- a/glib/gconvert.c
+++ b/glib/gconvert.c
@@ -566,8 +566,16 @@ close_converter (GIConv cd)
* </footnote>.
*
* Return value: If the conversion was successful, a newly allocated
- * nul-terminated string, which must be freed with
- * g_free(). Otherwise %NULL and @error will be set.
+ * nul-terminated<footnote id="nul-returns">
+ * <para>
+ * Nul-terminated return values from conversion functions
+ * are terminated by a single 0 byte only. This means that
+ * for multibyte character sets like UTF-16, they must be
+ * treated as not nul-terminated.
+ * </para>
+ * </footnote>
+ * string, which must be freed with g_free(). Otherwise %NULL
+ * and @error will be set.
**/
gchar*
g_convert_with_iconv (const gchar *str,
@@ -719,8 +727,9 @@ g_convert_with_iconv (const gchar *str,
* conversions<footnoteref linkend="streaming-state"/>.
*
* Return value: If the conversion was successful, a newly allocated
- * nul-terminated string, which must be freed with
- * g_free(). Otherwise %NULL and @error will be set.
+ * nul-terminated<footnoteref linkend="nul-returns"/> string,
+ * which must be freed with g_free(). Otherwise %NULL and
+ * @error will be set.
**/
gchar*
g_convert (const gchar *str,
@@ -794,8 +803,9 @@ g_convert (const gchar *str,
* conversions<footnoteref linkend="streaming-state"/>.
*
* Return value: If the conversion was successful, a newly allocated
- * nul-terminated string, which must be freed with
- * g_free(). Otherwise %NULL and @error will be set.
+ * nul-terminated<footnoteref linkend="nul-returns"/> string,
+ * which must be freed with g_free(). Otherwise %NULL and
+ * @error will be set.
**/
gchar*
g_convert_with_fallback (const gchar *str,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]