@matheusbsbs / matheus-bagliano / commits / 885becd9c4

string-list: return index directly when inserting an existing element

When inserting an existing element, "add_entry" would convert "index" value to "-1-index" to indicate the caller that this element is in the list already. However, in "string_list_insert", we would simply convert this to the original positive index without any further action. In 8fd2cb4069 (Extract helper bits from c-merge-recursive work, 2006-07-25), we create "path-list.c" and then introduce above code path. Let's directly return the index as we don't care about whether the element is in the list by using "add_entry". In the future, if we want to let "add_entry" tell the caller, we may add "int *exact_match" parameter to "add_entry" instead of converting the index to negative to indicate. Signed-off-by: shejialuo <shejialuo@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

shejialuo committed Jun 29, 2025 at 12:27 UTC 885becd9c4aec6c3764b4c701baf41853b49899e

1 file changed +1 -5

string-list.c

+1 -5

@@ -40,14 +40,13 @@ static int get_entry_index(const struct string_list *list, const char *string,

40 return right;

41 }

43 -/* returns -1-index if already exists */

43 static int add_entry(struct string_list *list, const char *string)

44 {

45 int exact_match = 0;

46 int index = get_entry_index(list, string, &exact_match);

48 if (exact_match)

50 - return -1 - index;

49 + return index;

51 ALLOC_GROW(list->items, list->nr+1, list->alloc);

52 if (index < list->nr)

@@ -65,9 +64,6 @@ struct string_list_item *string_list_insert(struct string_list *list, const char

64 {

65 int index = add_entry(list, string);

68 - if (index < 0)

69 - index = -1 - index;

70 -

67 return list->items + index;

68 }