tag_ape: move table lookup to tag_table.h

Allow code sharing.

3 files changed, 53 insertions, 9 deletions

diff --git a/Makefile.am b/Makefile.am
index 49b1f46e9..f154b5c26 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -192,6 +192,7 @@ mpd_headers = \
 	src/tag.h \
 	src/tag_internal.h \
 	src/tag_pool.h \
+	src/tag_table.h \
 	src/tag_ape.h \
 	src/tag_id3.h \
 	src/tag_print.h \
diff --git a/src/tag_ape.c b/src/tag_ape.c
index e8d396037..d527a13d8 100644
--- a/src/tag_ape.c
+++ b/src/tag_ape.c
@@ -20,13 +20,14 @@
 #include "config.h"
 #include "tag_ape.h"
 #include "tag.h"
+#include "tag_table.h"
 
 #include <glib.h>
 
 #include <assert.h>
 #include <stdio.h>
 
-static const char *const ape_tag_names[] = {
+static const char *const ape_tag_names[TAG_NUM_OF_ITEM_TYPES] = {
 	[TAG_TITLE] = "title",
 	[TAG_ARTIST] = "artist",
 	[TAG_ARTIST_SORT] = "artistsort",
@@ -51,14 +52,13 @@ tag_ape_import_item(struct tag *tag, unsigned long flags,
 	if ((flags & (0x3 << 1)) != 0)
 		return tag;
 
-	for (unsigned i = 0; i < G_N_ELEMENTS(ape_tag_names); i++) {
-		if (ape_tag_names[i] != NULL &&
-		    g_ascii_strcasecmp(key, ape_tag_names[i]) == 0) {
-			if (tag == NULL)
-				tag = tag_new();
-			tag_add_item_n(tag, i, value, value_length);
-		}
-	}
+	enum tag_type type = tag_table_lookup(ape_tag_names, key);
+	if (type == TAG_NUM_OF_ITEM_TYPES)
+		return tag;
+
+	if (tag == NULL)
+		tag = tag_new();
+	tag_add_item_n(tag, type, value, value_length);
 
 	return tag;
 }
diff --git a/src/tag_table.h b/src/tag_table.h
new file mode 100644
index 000000000..ce47d69fc
--- /dev/null
+++ b/src/tag_table.h
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2003-2010 The Music Player Daemon Project
+ * http://www.musicpd.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef MPD_TAG_TABLE_H
+#define MPD_TAG_TABLE_H
+
+#include "tag.h"
+
+#include <glib.h>
+
+/**
+ * Looks up a string in a tag translation table (case insensitive).
+ * Returns TAG_NUM_OF_ITEM_TYPES if the specified name was not found
+ * in the table.
+ */
+static inline enum tag_type
+tag_table_lookup(const char *const* table, const char *name)
+{
+	for (unsigned i = 0; i < TAG_NUM_OF_ITEM_TYPES; i++)
+		if (table[i] != NULL &&
+		    g_ascii_strcasecmp(name, table[i]) == 0)
+			return (enum tag_type)i;
+
+	return TAG_NUM_OF_ITEM_TYPES;
+}
+
+#endif