oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

path, tag: don't allocate GError for charset conversion

Browse Source 
Pass NULL instead of &error to g_convert().  We're not interested in
the error object.
This commit is contained in:
Max Kellermann
2009-01-04 19:50:22 +01:00
parent da69382273
commit 530f0b71de
3 changed files with 7 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/path.c
View File

@@ -32,16 +32,13 @@ static char *fs_charset;
char *fs_charset_to_utf8(char *dst, const char *str)
{
gchar *p;
GError *error = NULL;
p = g_convert(str, -1,
"utf-8", fs_charset,
NULL, NULL, &error);
if (p == NULL) {
NULL, NULL, NULL);
if (p == NULL)
/* no fallback */
g_error_free(error);
return NULL;
}
g_strlcpy(dst, p, MPD_PATH_MAX);
g_free(p);
@@ -51,16 +48,13 @@ char *fs_charset_to_utf8(char *dst, const char *str)
char *utf8_to_fs_charset(char *dst, const char *str)
{
gchar *p;
GError *error = NULL;
p = g_convert(str, -1,
fs_charset, "utf-8",
NULL, NULL, &error);
if (p == NULL) {
NULL, NULL, NULL);
if (p == NULL)
/* fall back to UTF-8 */
g_error_free(error);
return strcpy(dst, str);
}
g_strlcpy(dst, p, MPD_PATH_MAX);
g_free(p);