summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Persch <chpe@gnome.org>2011-06-18 16:22:53 +0200
committerChristian Persch <chpe@gnome.org>2011-06-19 13:14:39 +0200
commitf9cec26968fad4ddecae9b13077f63bc11b66f86 (patch)
tree6cd550be0f70905eaa74779f3961e02df5e8b5c8
parent580e177dccce98e4f8490b9463321d01343cac2d (diff)
downloadglib-f9cec26968fad4ddecae9b13077f63bc11b66f86.tar.gz
Clarify nul-termination of g_utf8_to_ucs4[_fast] result
The docs for g_utf8_to_ucs4_fast didn't mention that the resulting string is terminated by a 0 character. Bug #652897.
-rw-r--r--glib/gutf8.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/glib/gutf8.c b/glib/gutf8.c
index 249b6ad2a..7977f3a76 100644
--- a/glib/gutf8.c
+++ b/glib/gutf8.c
@@ -841,7 +841,8 @@ g_utf8_get_char_validated (const gchar *p,
* Convert a string from UTF-8 to a 32-bit fixed width
* representation as UCS-4, assuming valid UTF-8 input.
* This function is roughly twice as fast as g_utf8_to_ucs4()
- * but does no error checking on the input.
+ * but does no error checking on the input. A trailing 0 character
+ * will be added to the string after the converted text.
*
* Return value: a pointer to a newly allocated UCS-4 string.
* This value must be freed with g_free().
@@ -940,7 +941,7 @@ g_utf8_to_ucs4_fast (const gchar *str,
* %G_CONVERT_ERROR_NO_CONVERSION may occur.
*
* Convert a string from UTF-8 to a 32-bit fixed width
- * representation as UCS-4. A trailing 0 will be added to the
+ * representation as UCS-4. A trailing 0 character will be added to the
* string after the converted text.
*
* Return value: a pointer to a newly allocated UCS-4 string.