From 767ade02f4af8cdb6b7de293d0bd433bc7fd24cf Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Sat, 11 Feb 2012 10:34:21 +0100 Subject: tag_table: convert to a struct The struct is smaller because it is sparse. Its traversal is also more efficient. --- src/tag_table.h | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'src/tag_table.h') diff --git a/src/tag_table.h b/src/tag_table.h index 367a3de5..ecb3805d 100644 --- a/src/tag_table.h +++ b/src/tag_table.h @@ -24,18 +24,24 @@ #include +struct tag_table { + const char *name; + + enum tag_type type; +}; + /** * 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. */ +G_GNUC_PURE static inline enum tag_type -tag_table_lookup(const char *const* table, const char *name) +tag_table_lookup_i(const struct tag_table *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; + for (; table->name != NULL; ++table) + if (g_ascii_strcasecmp(name, table->name) == 0) + return table->type; return TAG_NUM_OF_ITEM_TYPES; } -- cgit v1.2.3