From 530f0b71de6d0e44911528eb4e256d165ed77c31 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
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/path.c    | 14 ++++----------
 src/tag.c     |  7 ++-----
 src/tag_id3.c |  5 +----
 3 files changed, 7 insertions(+), 19 deletions(-)

(limited to 'src')

diff --git a/src/path.c b/src/path.c
index 2698957f7..88ac9382e 100644
--- a/src/path.c
+++ b/src/path.c
@@ -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);
diff --git a/src/tag.c b/src/tag.c
index 343f4d91c..df32585c4 100644
--- a/src/tag.c
+++ b/src/tag.c
@@ -406,7 +406,6 @@ static char *
 fix_utf8(const char *str, size_t length)
 {
 	char *temp;
-	GError *error = NULL;
 	gsize written;
 
 	assert(str != NULL);
@@ -416,11 +415,9 @@ fix_utf8(const char *str, size_t length)
 
 	DEBUG("not valid utf8 in tag: %s\n",str);
 	temp = g_convert(str, length, "utf-8", "iso-8859-1",
-			 NULL, &written, &error);
-	if (temp == NULL) {
-		g_error_free(error);
+			 NULL, &written, NULL);
+	if (temp == NULL)
 		return NULL;
-	}
 
 	return temp;
 }
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