luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-08-20 23:58:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Make g_utf8_make_valid public

Browse Source 
Based on a patch by Simon van der Linden and rebased onto current GLib,
with improved documentation loosely based on Telepathy's
tp_utf8_make_valid().

Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Bug: https://bugzilla.gnome.org/show_bug.cgi?id=591603
Bug: https://bugzilla.gnome.org/show_bug.cgi?id=610969
Reviewed-by: Colin Walters <walters@verbum.org>
This commit is contained in:
Simon McVittie
2016-10-13 12:42:09 +01:00
committed by Simon McVittie
parent 01bfa16986
commit c46dbd4752
6 changed files with 36 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
glib/gutf8.c
View File

@@ -1735,19 +1735,36 @@ g_utf8_strreverse (const gchar *str,
return result;
}
/**
* g_utf8_make_valid:
* @str: string to coerce into UTF-8
*
* If the provided string is valid UTF-8, return a copy of it. If not,
* return a copy in which bytes that could not be interpreted as valid Unicode
* are replaced with the Unicode replacement character (U+FFFD).
*
* For example, this is an appropriate function to use if you have received
* a string that was incorrectly declared to be UTF-8, and you need a valid
* UTF-8 version of it that can be logged or displayed to the user, with the
* assumption that it is close enough to ASCII or UTF-8 to be mostly
* readable as-is.
*
* Returns: (transfer full): a valid UTF-8 string whose content resembles @str
*
* Since: 2.52
*/
gchar *
_g_utf8_make_valid (const gchar *name)
g_utf8_make_valid (const gchar *str)
{
GString *string;
const gchar *remainder, *invalid;
gint remaining_bytes, valid_bytes;
g_return_val_if_fail (name != NULL, NULL);
g_return_val_if_fail (str != NULL, NULL);
string = NULL;
remainder = name;
remaining_bytes = strlen (name);
remainder = str;
remaining_bytes = strlen (str);
while (remaining_bytes != 0)
{
@@ -1767,7 +1784,7 @@ _g_utf8_make_valid (const gchar *name)
}
if (string == NULL)
return g_strdup (name);
return g_strdup (str);
g_string_append (string, remainder);