Skip to content

Commit aadceea

Browse files
qurgitster
authored andcommitted
string_list: Fix argument order for string_list_insert_at_index
Update the definition and callers of string_list_insert_at_index to use the string_list as the first argument. This helps make the string_list API easier to use by being more consistent. Signed-off-by: Julian Phillips <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 78a395d commit aadceea

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

mailmap.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ static void add_mapping(struct string_list *map,
6969
index = -1 - index;
7070
} else {
7171
/* create mailmap entry */
72-
struct string_list_item *item = string_list_insert_at_index(index, old_email, map);
72+
struct string_list_item *item = string_list_insert_at_index(map, index, old_email);
7373
item->util = xmalloc(sizeof(struct mailmap_entry));
7474
memset(item->util, 0, sizeof(struct mailmap_entry));
7575
((struct mailmap_entry *)item->util)->namemap.strdup_strings = 1;

string-list.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,11 @@ static int add_entry(int insert_at, struct string_list *list, const char *string
5353

5454
struct string_list_item *string_list_insert(struct string_list *list, const char *string)
5555
{
56-
return string_list_insert_at_index(-1, string, list);
56+
return string_list_insert_at_index(list, -1, string);
5757
}
5858

59-
struct string_list_item *string_list_insert_at_index(int insert_at,
60-
const char *string, struct string_list *list)
59+
struct string_list_item *string_list_insert_at_index(struct string_list *list,
60+
int insert_at, const char *string)
6161
{
6262
int index = add_entry(insert_at, list, string);
6363

string-list.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ int string_list_has_string(const struct string_list *list, const char *string);
3030
int string_list_find_insert_index(const struct string_list *list, const char *string,
3131
int negative_existing_index);
3232
struct string_list_item *string_list_insert(struct string_list *list, const char *string);
33-
struct string_list_item *string_list_insert_at_index(int insert_at,
34-
const char *string, struct string_list *list);
33+
struct string_list_item *string_list_insert_at_index(struct string_list *list,
34+
int insert_at, const char *string);
3535
struct string_list_item *string_list_lookup(const char *string, struct string_list *list);
3636

3737
/* Use these functions only on unsorted lists: */

0 commit comments

Comments
 (0)