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

locate: make "tag" unsigned

Browse Source
This commit is contained in:
Max Kellermann 2012-08-08 00:45:46 +02:00
parent 3d2092ee23
commit 860e9eb8c9
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/locate.c
View File

@ -33,7 +33,7 @@
/* struct used for search, find, list queries */ /* struct used for search, find, list queries */
struct locate_item { struct locate_item {
int8_t tag; uint8_t tag;
/* what we are looking for */ /* what we are looking for */
char *needle; char *needle;
}; };
@ -49,7 +49,7 @@ struct locate_item_list {
struct locate_item items[1]; struct locate_item items[1];
}; };
int unsigned
locate_parse_type(const char *str) locate_parse_type(const char *str)
{ {
if (0 == g_ascii_strcasecmp(str, LOCATE_TAG_FILE_KEY) || if (0 == g_ascii_strcasecmp(str, LOCATE_TAG_FILE_KEY) ||
@ -59,11 +59,7 @@ locate_parse_type(const char *str)
if (0 == g_ascii_strcasecmp(str, LOCATE_TAG_ANY_KEY)) if (0 == g_ascii_strcasecmp(str, LOCATE_TAG_ANY_KEY))
return LOCATE_TAG_ANY_TYPE; return LOCATE_TAG_ANY_TYPE;
enum tag_type i = tag_name_parse_i(str); return tag_name_parse_i(str);
if (i != TAG_NUM_OF_ITEM_TYPES)
return i;
return -1;
} }
static bool static bool
@ -73,7 +69,7 @@ locate_item_init(struct locate_item *item,
{ {
item->tag = locate_parse_type(type_string); item->tag = locate_parse_type(type_string);
if (item->tag < 0) if (item->tag == TAG_NUM_OF_ITEM_TYPES)
return false; return false;
item->needle = fold_case item->needle = fold_case

5
src/locate.h
View File

@ -31,8 +31,11 @@
struct locate_item_list; struct locate_item_list;
struct song; struct song;
/**
* @return #TAG_NUM_OF_ITEM_TYPES on error
*/
gcc_pure gcc_pure
int unsigned
locate_parse_type(const char *str); locate_parse_type(const char *str);
gcc_malloc gcc_malloc