Skip to content

Commit

Permalink
path-list: add functions to work with unsorted lists
Browse files Browse the repository at this point in the history
Up to now, path-lists were sorted at all times.  But sometimes it
is much more convenient to build the list and sort it at the end,
or sort it not at all.

Add path_list_append() and sort_path_list() to allow that.

Also, add the unsorted_path_list_has_path() function, to do a linear
search.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Johannes Schindelin authored and Junio C Hamano committed Mar 1, 2008
1 parent 6d21667 commit 363d59d
Show file tree
Hide file tree
Showing 2 changed files with 37 additions and 1 deletion.
30 changes: 30 additions & 0 deletions path-list.c
Original file line number Diff line number Diff line change
Expand Up @@ -102,3 +102,33 @@ void print_path_list(const char *text, const struct path_list *p)
for (i = 0; i < p->nr; i++)
printf("%s:%p\n", p->items[i].path, p->items[i].util);
}

struct path_list_item *path_list_append(const char *path, struct path_list *list)
{
ALLOC_GROW(list->items, list->nr + 1, list->alloc);
list->items[list->nr].path =
list->strdup_paths ? xstrdup(path) : (char *)path;
return list->items + list->nr++;
}

static int cmp_items(const void *a, const void *b)
{
const struct path_list_item *one = a;
const struct path_list_item *two = b;
return strcmp(one->path, two->path);
}

void sort_path_list(struct path_list *list)
{
qsort(list->items, list->nr, sizeof(*list->items), cmp_items);
}

int unsorted_path_list_has_path(struct path_list *list, const char *path)
{
int i;
for (i = 0; i < list->nr; i++)
if (!strcmp(path, list->items[i].path))
return 1;
return 0;
}

8 changes: 7 additions & 1 deletion path-list.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,16 @@ struct path_list
};

void print_path_list(const char *text, const struct path_list *p);
void path_list_clear(struct path_list *list, int free_util);

/* Use these functions only on sorted lists: */
int path_list_has_path(const struct path_list *list, const char *path);
void path_list_clear(struct path_list *list, int free_util);
struct path_list_item *path_list_insert(const char *path, struct path_list *list);
struct path_list_item *path_list_lookup(const char *path, struct path_list *list);

/* Use these functions only on unsorted lists: */
struct path_list_item *path_list_append(const char *path, struct path_list *list);
void sort_path_list(struct path_list *list);
int unsorted_path_list_has_path(struct path_list *list, const char *path);

#endif /* PATH_LIST_H */

0 comments on commit 363d59d

Please sign in to comment.