[glib] Annotate g_filename_to_utf8()
- From: Martin Pitt <martinpitt src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib] Annotate g_filename_to_utf8()
- Date: Sat, 3 Nov 2012 13:01:18 +0000 (UTC)
commit 13ae0f1f922defaf21c3a5dbe8d299cddc71170a
Author: Martin Pitt <martinpitt gnome org>
Date: Sat Nov 3 13:52:29 2012 +0100
Annotate g_filename_to_utf8()
bytes_read and bytes_written are (out) arguments, and the return value must be
a byte array instead of utf8, as otherwise the function would only support
UTF-8 locales/file names.
glib/gconvert.c | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
---
diff --git a/glib/gconvert.c b/glib/gconvert.c
index 368bef5..f189c24 100644
--- a/glib/gconvert.c
+++ b/glib/gconvert.c
@@ -1496,15 +1496,15 @@ g_filename_to_utf8 (const gchar *opsysstring,
* @utf8string: a UTF-8 encoded string.
* @len: the length of the string, or -1 if the string is
* nul-terminated.
- * @bytes_read: location to store the number of bytes in the
- * input string that were successfully converted, or %NULL.
+ * @bytes_read: (out) (allow-none): location to store the number of bytes in
+ * the input string that were successfully converted, or %NULL.
* Even if the conversion was successful, this may be
* less than @len if there were partial characters
* at the end of the input. If the error
* #G_CONVERT_ERROR_ILLEGAL_SEQUENCE occurs, the value
* stored will the byte offset after the last valid
* input sequence.
- * @bytes_written: the number of bytes stored in the output buffer (not
+ * @bytes_written: (out): the number of bytes stored in the output buffer (not
* including the terminating nul).
* @error: location to store the error occurring, or %NULL to ignore
* errors. Any of the errors in #GConvertError may occur.
@@ -1514,7 +1514,8 @@ g_filename_to_utf8 (const gchar *opsysstring,
* on other platforms, this function indirectly depends on the
* <link linkend="setlocale">current locale</link>.
*
- * Return value: The converted string, or %NULL on an error.
+ * Return value: (array length=bytes_written) (element-type guint8) (transfer full):
+ * The converted string, or %NULL on an error.
**/
gchar*
g_filename_from_utf8 (const gchar *utf8string,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]