From 7cca55549b247f14e40d4d5f21aceb88d0261b12 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Sun, 19 Jul 2009 17:59:36 +0200
Subject: tag_ape: moved code to tag_ape_import_item()

Improve code readability.
---
 src/tag_ape.c | 34 ++++++++++++++++++++++------------
 1 file changed, 22 insertions(+), 12 deletions(-)

diff --git a/src/tag_ape.c b/src/tag_ape.c
index 2ffc9b80b..5dc13d9c5 100644
--- a/src/tag_ape.c
+++ b/src/tag_ape.c
@@ -45,6 +45,26 @@ static const int tagItems[7] = {
 	TAG_ITEM_DATE,
 };
 
+static struct tag *
+tag_ape_import_item(struct tag *tag, unsigned long flags,
+		    const char *key, const char *value, size_t value_length)
+{
+	/* we only care about utf-8 text tags */
+	if ((flags & (0x3 << 1)) != 0)
+		return tag;
+
+	for (unsigned i = 0; i < 7; i++) {
+		if (g_ascii_strcasecmp(key, apeItems[i]) == 0) {
+			if (tag == NULL)
+				tag = tag_new();
+			tag_add_item_n(tag, tagItems[i],
+				       value, value_length);
+		}
+	}
+
+	return tag;
+}
+
 struct tag *
 tag_ape_load(const char *file)
 {
@@ -56,7 +76,6 @@ tag_ape_load(const char *file)
 	size_t tagLen;
 	size_t size;
 	unsigned long flags;
-	int i;
 	char *key;
 
 	struct {
@@ -127,17 +146,8 @@ tag_ape_load(const char *file)
 		if (tagLen < size)
 			goto fail;
 
-		/* we only care about utf-8 text tags */
-		if (!(flags & (0x3 << 1))) {
-			for (i = 0; i < 7; i++) {
-				if (g_ascii_strcasecmp(key, apeItems[i]) == 0) {
-					if (!ret)
-						ret = tag_new();
-					tag_add_item_n(ret, tagItems[i],
-						       p, size);
-				}
-			}
-		}
+		ret = tag_ape_import_item(ret, flags, key, p, size);
+
 		p += size;
 		tagLen -= size;
 	}
-- 
cgit v1.2.3