From 530f0b71de6d0e44911528eb4e256d165ed77c31 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Sun, 4 Jan 2009 19:50:22 +0100 Subject: path, tag: don't allocate GError for charset conversion Pass NULL instead of &error to g_convert(). We're not interested in the error object. --- src/tag_id3.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'src/tag_id3.c') diff --git a/src/tag_id3.c b/src/tag_id3.c index d060c658c..b98d8af57 100644 --- a/src/tag_id3.c +++ b/src/tag_id3.c @@ -54,8 +54,6 @@ static id3_utf8_t * processID3FieldString (int is_id3v1, const id3_ucs4_t *ucs4, /* use encoding field here? */ if (is_id3v1 && (encoding = getConfigParamValue(CONF_ID3V1_ENCODING))) { - GError *error = NULL; - isostr = id3_ucs4_latin1duplicate(ucs4); if (G_UNLIKELY(!isostr)) { return NULL; @@ -64,11 +62,10 @@ static id3_utf8_t * processID3FieldString (int is_id3v1, const id3_ucs4_t *ucs4, utf8 = (id3_utf8_t *) g_convert_with_fallback((const char*)isostr, -1, encoding, "utf-8", - NULL, NULL, NULL, &error); + NULL, NULL, NULL, NULL); if (utf8 == NULL) { g_debug("Unable to convert %s string to UTF-8: '%s'", encoding, isostr); - g_error_free(error); g_free(isostr); return NULL; } -- cgit v1.2.3