Skip to content

M
mpd
Commit 04c02a1e authored by Max Kellermann's avatar Max Kellermann
Browse files
Options

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.
parent 41487426
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
src/locate.c
View file @ 04c02a1e
...@@ -127,7 +127,7 @@ locate_tag_search(const struct song *song, enum tag_type type, const char *str) ...@@ -127,7 +127,7 @@ locate_tag_search(const struct song *song, enum tag_type type, const char *str)
{ {
bool ret = false; 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 *uri = song_get_uri(song);
char *p = g_utf8_casefold(uri, -1); char *p = g_utf8_casefold(uri, -1);
g_free(uri); g_free(uri);
...@@ -147,7 +147,7 @@ locate_tag_search(const struct song *song, enum tag_type type, const char *str) ...@@ -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++) { for (unsigned i = 0; i < song->tag->num_items && !ret; i++) {
visited_types[song->tag->items[i]->type] = true; 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) { song->tag->items[i]->type != type) {
continue; continue;
} }
...@@ -185,7 +185,7 @@ locate_song_search(const struct song *song, ...@@ -185,7 +185,7 @@ locate_song_search(const struct song *song,
static bool static bool
locate_tag_match(const struct song *song, enum tag_type type, const char *str) 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); char *uri = song_get_uri(song);
bool matches = strcmp(str, uri) == 0; bool matches = strcmp(str, uri) == 0;
g_free(uri); g_free(uri);
...@@ -205,7 +205,7 @@ locate_tag_match(const struct song *song, enum tag_type type, const char *str) ...@@ -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++) { for (unsigned i = 0; i < song->tag->num_items; i++) {
visited_types[song->tag->items[i]->type] = true; 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) { song->tag->items[i]->type != type) {
continue; continue;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment