oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

locate: cast enum tag_type to int before comparing with integer

Browse Source 
Avoids clang pickiness.  This code is not correct, but we'll fix that
another day.
This commit is contained in:
Max Kellermann 2012-09-22 09:48:27 +02:00
parent 41487426f5
commit 04c02a1eb8
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/locate.c
View File

@ -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)
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,
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)
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;
} }