locate: added locate_item_list_casefold()

Merged casefolding code from two locations into this one library
function.
This commit is contained in:
Max Kellermann 2009-01-24 15:56:34 +01:00
parent 6a2118d04c
commit e6cb939a82
4 changed files with 22 additions and 11 deletions

View File

@ -84,14 +84,10 @@ searchForSongsIn(struct client *client, const char *name,
const struct locate_item_list *criteria)
{
int ret;
struct locate_item_list *new_list;
struct locate_item_list *new_list
= locate_item_list_casefold(criteria);
struct search_data data;
new_list = locate_item_list_new(criteria->length);
for (unsigned i = 0; i < criteria->length; i++)
new_list->items[i].needle =
g_utf8_casefold(criteria->items[i].needle, -1);
data.client = client;
data.criteria = new_list;

View File

@ -117,6 +117,18 @@ locate_item_list_parse(char *argv[], int argc)
return list;
}
struct locate_item_list *
locate_item_list_casefold(const struct locate_item_list *list)
{
struct locate_item_list *new_list = locate_item_list_new(list->length);
for (unsigned i = 0; i < list->length; i++)
new_list->items[i].needle =
g_utf8_casefold(list->items[i].needle, -1);
return new_list;
}
void
locate_item_free(struct locate_item *item)
{

View File

@ -63,6 +63,13 @@ locate_item_list_new(unsigned length);
struct locate_item_list *
locate_item_list_parse(char *argv[], int argc);
/**
* Duplicate the struct locate_item_list object and convert all
* needles with g_utf8_casefold().
*/
struct locate_item_list *
locate_item_list_casefold(const struct locate_item_list *list);
void
locate_item_list_free(struct locate_item_list *list);

View File

@ -85,11 +85,7 @@ queue_search(struct client *client, const struct queue *queue,
{
unsigned i;
struct locate_item_list *new_list =
locate_item_list_new(criteria->length);
for (i = 0; i < criteria->length; i++)
new_list->items[i].needle =
g_utf8_casefold(criteria->items[i].needle, -1);
locate_item_list_casefold(criteria);
for (i = 0; i < queue_length(queue); i++) {
const struct song *song = queue_get(queue, i);