mirror of
https://github.com/git/git.git
synced 2024-10-31 22:37:54 +01:00
62b8102c60
It is not immediately obvious that the util field may contain random bytes after appending an item. Especially since the string_list_insert* functions _do_ explicitly zero the util pointer. This does not appear to be a bug in any current git code, as all callers either fill in the util field immediately or never use it. However, it is worth it to be less surprising to new users of the string-list API who may expect it to be intialized to NULL. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
187 lines
4.5 KiB
C
187 lines
4.5 KiB
C
#include "cache.h"
|
|
#include "string-list.h"
|
|
|
|
/* if there is no exact match, point to the index where the entry could be
|
|
* inserted */
|
|
static int get_entry_index(const struct string_list *list, const char *string,
|
|
int *exact_match)
|
|
{
|
|
int left = -1, right = list->nr;
|
|
|
|
while (left + 1 < right) {
|
|
int middle = (left + right) / 2;
|
|
int compare = strcmp(string, list->items[middle].string);
|
|
if (compare < 0)
|
|
right = middle;
|
|
else if (compare > 0)
|
|
left = middle;
|
|
else {
|
|
*exact_match = 1;
|
|
return middle;
|
|
}
|
|
}
|
|
|
|
*exact_match = 0;
|
|
return right;
|
|
}
|
|
|
|
/* returns -1-index if already exists */
|
|
static int add_entry(int insert_at, struct string_list *list, const char *string)
|
|
{
|
|
int exact_match = 0;
|
|
int index = insert_at != -1 ? insert_at : get_entry_index(list, string, &exact_match);
|
|
|
|
if (exact_match)
|
|
return -1 - index;
|
|
|
|
if (list->nr + 1 >= list->alloc) {
|
|
list->alloc += 32;
|
|
list->items = xrealloc(list->items, list->alloc
|
|
* sizeof(struct string_list_item));
|
|
}
|
|
if (index < list->nr)
|
|
memmove(list->items + index + 1, list->items + index,
|
|
(list->nr - index)
|
|
* sizeof(struct string_list_item));
|
|
list->items[index].string = list->strdup_strings ?
|
|
xstrdup(string) : (char *)string;
|
|
list->items[index].util = NULL;
|
|
list->nr++;
|
|
|
|
return index;
|
|
}
|
|
|
|
struct string_list_item *string_list_insert(struct string_list *list, const char *string)
|
|
{
|
|
return string_list_insert_at_index(list, -1, string);
|
|
}
|
|
|
|
struct string_list_item *string_list_insert_at_index(struct string_list *list,
|
|
int insert_at, const char *string)
|
|
{
|
|
int index = add_entry(insert_at, list, string);
|
|
|
|
if (index < 0)
|
|
index = -1 - index;
|
|
|
|
return list->items + index;
|
|
}
|
|
|
|
int string_list_has_string(const struct string_list *list, const char *string)
|
|
{
|
|
int exact_match;
|
|
get_entry_index(list, string, &exact_match);
|
|
return exact_match;
|
|
}
|
|
|
|
int string_list_find_insert_index(const struct string_list *list, const char *string,
|
|
int negative_existing_index)
|
|
{
|
|
int exact_match;
|
|
int index = get_entry_index(list, string, &exact_match);
|
|
if (exact_match)
|
|
index = -1 - (negative_existing_index ? index : 0);
|
|
return index;
|
|
}
|
|
|
|
struct string_list_item *string_list_lookup(struct string_list *list, const char *string)
|
|
{
|
|
int exact_match, i = get_entry_index(list, string, &exact_match);
|
|
if (!exact_match)
|
|
return NULL;
|
|
return list->items + i;
|
|
}
|
|
|
|
int for_each_string_list(struct string_list *list,
|
|
string_list_each_func_t fn, void *cb_data)
|
|
{
|
|
int i, ret = 0;
|
|
for (i = 0; i < list->nr; i++)
|
|
if ((ret = fn(&list->items[i], cb_data)))
|
|
break;
|
|
return ret;
|
|
}
|
|
|
|
void string_list_clear(struct string_list *list, int free_util)
|
|
{
|
|
if (list->items) {
|
|
int i;
|
|
if (list->strdup_strings) {
|
|
for (i = 0; i < list->nr; i++)
|
|
free(list->items[i].string);
|
|
}
|
|
if (free_util) {
|
|
for (i = 0; i < list->nr; i++)
|
|
free(list->items[i].util);
|
|
}
|
|
free(list->items);
|
|
}
|
|
list->items = NULL;
|
|
list->nr = list->alloc = 0;
|
|
}
|
|
|
|
void string_list_clear_func(struct string_list *list, string_list_clear_func_t clearfunc)
|
|
{
|
|
if (list->items) {
|
|
int i;
|
|
if (clearfunc) {
|
|
for (i = 0; i < list->nr; i++)
|
|
clearfunc(list->items[i].util, list->items[i].string);
|
|
}
|
|
if (list->strdup_strings) {
|
|
for (i = 0; i < list->nr; i++)
|
|
free(list->items[i].string);
|
|
}
|
|
free(list->items);
|
|
}
|
|
list->items = NULL;
|
|
list->nr = list->alloc = 0;
|
|
}
|
|
|
|
|
|
void print_string_list(const struct string_list *p, const char *text)
|
|
{
|
|
int i;
|
|
if ( text )
|
|
printf("%s\n", text);
|
|
for (i = 0; i < p->nr; i++)
|
|
printf("%s:%p\n", p->items[i].string, p->items[i].util);
|
|
}
|
|
|
|
struct string_list_item *string_list_append(struct string_list *list, const char *string)
|
|
{
|
|
ALLOC_GROW(list->items, list->nr + 1, list->alloc);
|
|
list->items[list->nr].string =
|
|
list->strdup_strings ? xstrdup(string) : (char *)string;
|
|
list->items[list->nr].util = NULL;
|
|
return list->items + list->nr++;
|
|
}
|
|
|
|
static int cmp_items(const void *a, const void *b)
|
|
{
|
|
const struct string_list_item *one = a;
|
|
const struct string_list_item *two = b;
|
|
return strcmp(one->string, two->string);
|
|
}
|
|
|
|
void sort_string_list(struct string_list *list)
|
|
{
|
|
qsort(list->items, list->nr, sizeof(*list->items), cmp_items);
|
|
}
|
|
|
|
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 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;
|
|
}
|
|
|