Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
string-list: add unsorted_string_list_lookup()
Sometimes users need to lookup a string in an unsorted string_list. In
that case they should use this function instead of the version for
sorted strings.

Signed-off-by: Stephen Boyd <bebarino@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
bebarino authored and gitster committed Mar 25, 2010
1 parent 15cb500 commit e242148
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 5 deletions.
6 changes: 5 additions & 1 deletion Documentation/technical/api-string-list.txt
Expand Up @@ -104,8 +104,12 @@ write `string_list_insert(...)->util = ...;`.
`unsorted_string_list_has_string`::

It's like `string_list_has_string()` but for unsorted lists.

`unsorted_string_list_lookup`::

It's like `string_list_lookup()` but for unsorted lists.
+
This function needs to look through all items, as opposed to its
The above two functions need to look through all items, as opposed to their
counterpart for sorted lists, which performs a binary search.

Data structures
Expand Down
13 changes: 10 additions & 3 deletions string-list.c
Expand Up @@ -168,12 +168,19 @@ void sort_string_list(struct string_list *list)
qsort(list->items, list->nr, sizeof(*list->items), cmp_items);
}

int unsorted_string_list_has_string(struct string_list *list, const char *string)
struct string_list_item *unsorted_string_list_lookup(struct string_list *list,
const char *string)
{
int i;
for (i = 0; i < list->nr; i++)
if (!strcmp(string, list->items[i].string))
return 1;
return 0;
return list->items + i;
return NULL;
}

int unsorted_string_list_has_string(struct string_list *list,
const char *string)
{
return unsorted_string_list_lookup(list, string) != NULL;
}

3 changes: 2 additions & 1 deletion string-list.h
Expand Up @@ -38,5 +38,6 @@ struct string_list_item *string_list_lookup(const char *string, struct string_li
struct string_list_item *string_list_append(const char *string, struct string_list *list);
void sort_string_list(struct string_list *list);
int unsorted_string_list_has_string(struct string_list *list, const char *string);

struct string_list_item *unsorted_string_list_lookup(struct string_list *list,
const char *string);
#endif /* STRING_LIST_H */

0 comments on commit e242148

Please sign in to comment.