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

songvec: simplified compare_tag_item() 

Moved some code to tag_get_value_checked(), to eliminate several NULL
checks.
This commit is contained in:
Max Kellermann 2009-10-31 17:32:00 +01:00
parent 25a806a347
commit d099a7e464
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/songvec.c
View File

@ -29,6 +29,14 @@
static GMutex *nr_lock = NULL; static GMutex *nr_lock = NULL;
static const char *
tag_get_value_checked(const struct tag *tag, enum tag_type type)
{
return tag != NULL
? tag_get_value(tag, type)
: NULL;
}
/** /**
* Compare two tag values which should contain an integer value * Compare two tag values which should contain an integer value
* (e.g. disc or track number). Either one may be NULL. * (e.g. disc or track number). Either one may be NULL.
@ -51,14 +59,8 @@ compare_number_string(const char *a, const char *b)
static int static int
compare_tag_item(const struct tag *a, const struct tag *b, enum tag_type type) compare_tag_item(const struct tag *a, const struct tag *b, enum tag_type type)
{ {
if (a == NULL) return compare_number_string(tag_get_value_checked(a, type),
return b == NULL ? 0 : -1; tag_get_value_checked(b, type));
if (b == NULL)
return 1;
return compare_number_string(tag_get_value(a, type),
tag_get_value(b, type));
} }
/* Only used for sorting/searchin a songvec, not general purpose compares */ /* Only used for sorting/searchin a songvec, not general purpose compares */