luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-26 05:56:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

gconvert: g_filename_from_utf8() returns (type filename)

Browse Source 
The existing array annotation is inconsistent with the other
conversion functions. Now that the implementation guarantees
no embedded NULs, the return value can be re-annotated.

https://bugzilla.gnome.org/show_bug.cgi?id=756128
This commit is contained in:
Mikhail Zabaluev 2018-02-08 23:33:13 +02:00 committed by Philip Withnall
parent 8a93e2d54e
commit 7f1fd247a7
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
glib/gconvert.c
View File

@ -1287,7 +1287,7 @@ g_filename_to_utf8 (const gchar *opsysstring,
/**
* g_filename_from_utf8:
* @utf8string: a UTF-8 encoded string.
* @utf8string: (type utf8): a UTF-8 encoded string.
* @len: the length of the string, or -1 if the string is
* nul-terminated.
* @bytes_read: (out) (optional): location to store the number of bytes in
@ -1310,10 +1310,11 @@ g_filename_to_utf8 (const gchar *opsysstring,
*
* The input string shall not contain nul characters even if the @len
* argument is positive. A nul character found inside the string will result
* in error %G_CONVERT_ERROR_ILLEGAL_SEQUENCE. Note that nul bytes are
* prohibited in all filename encodings that GLib is known to work with.
* in error %G_CONVERT_ERROR_ILLEGAL_SEQUENCE. If the filename encoding is
* not UTF-8 and the conversion output contains a nul character, the error
* %G_CONVERT_ERROR_EMBEDDED_NUL is set and the function returns %NULL.
*
* Returns: (array length=bytes_written) (element-type guint8) (transfer full):
* Returns: (type filename):
* The converted string, or %NULL on an error.
**/
gchar*