From 04c02a1eb89f0ccc7984976afb708b675d494578 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Sat, 22 Sep 2012 09:48:27 +0200 Subject: locate: cast enum tag_type to int before comparing with integer Avoids clang pickiness. This code is not correct, but we'll fix that another day. --- src/locate.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/locate.c b/src/locate.c index 9645da9cd..c9684d2b6 100644 --- a/src/locate.c +++ b/src/locate.c @@ -127,7 +127,7 @@ locate_tag_search(const struct song *song, enum tag_type type, const char *str) { bool ret = false; - if (type == LOCATE_TAG_FILE_TYPE || type == LOCATE_TAG_ANY_TYPE) { + if (type == LOCATE_TAG_FILE_TYPE || (int)type == LOCATE_TAG_ANY_TYPE) { char *uri = song_get_uri(song); char *p = g_utf8_casefold(uri, -1); g_free(uri); @@ -147,7 +147,7 @@ locate_tag_search(const struct song *song, enum tag_type type, const char *str) for (unsigned i = 0; i < song->tag->num_items && !ret; i++) { visited_types[song->tag->items[i]->type] = true; - if (type != LOCATE_TAG_ANY_TYPE && + if ((int)type != LOCATE_TAG_ANY_TYPE && song->tag->items[i]->type != type) { continue; } @@ -185,7 +185,7 @@ locate_song_search(const struct song *song, static bool locate_tag_match(const struct song *song, enum tag_type type, const char *str) { - if (type == LOCATE_TAG_FILE_TYPE || type == LOCATE_TAG_ANY_TYPE) { + if (type == LOCATE_TAG_FILE_TYPE || (int)type == LOCATE_TAG_ANY_TYPE) { char *uri = song_get_uri(song); bool matches = strcmp(str, uri) == 0; g_free(uri); @@ -205,7 +205,7 @@ locate_tag_match(const struct song *song, enum tag_type type, const char *str) for (unsigned i = 0; i < song->tag->num_items; i++) { visited_types[song->tag->items[i]->type] = true; - if (type != LOCATE_TAG_ANY_TYPE && + if ((int)type != LOCATE_TAG_ANY_TYPE && song->tag->items[i]->type != type) { continue; } -- cgit v1.2.3