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 <julian@quantumfyre.co.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Julian Phillips committed
Jun 26, 2010 at 00:41 UTC
aadceea641806b363ca555ffdc04109ea716c497
3 files changed
+6
-6
mailmap.c
+1
-1
@@ -69,7 +69,7 @@ static void add_mapping(struct string_list *map,
69
index = -1 - index;
70
} else {
71
/* 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);
73
item->util = xmalloc(sizeof(struct mailmap_entry));
74
memset(item->util, 0, sizeof(struct mailmap_entry));
75
((struct mailmap_entry *)item->util)->namemap.strdup_strings = 1;
string-list.c
+3
-3
@@ -53,11 +53,11 @@ static int add_entry(int insert_at, struct string_list *list, const char *string
53
54
struct string_list_item *string_list_insert(struct string_list *list, const char *string)
55
{
56
- return string_list_insert_at_index(-1, string, list);
56
+ return string_list_insert_at_index(list, -1, string);
57
}
58
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)
61
{
62
int index = add_entry(insert_at, list, string);
63
string-list.h
+2
-2
@@ -30,8 +30,8 @@ int string_list_has_string(const struct string_list *list, const char *string);
30
int string_list_find_insert_index(const struct string_list *list, const char *string,
31
int negative_existing_index);
32
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);
35
struct string_list_item *string_list_lookup(const char *string, struct string_list *list);
36
37
/* Use these functions only on unsorted lists: */