diff options
| author |  Julian Phillips <julian@quantumfyre.co.uk> | 2010-06-26 00:41:36 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2010-06-27 10:06:51 -0700 |
| commit | aadceea641806b363ca555ffdc04109ea716c497 (patch) | |
| tree | bae93989bf8c6169b23c1c43b8fb0810665ebfaf | |
| parent | string_list: Fix argument order for string_list_insert (diff) | |
| download | tgif-aadceea641806b363ca555ffdc04109ea716c497.tar.xz | |
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>
| -rw-r--r-- | mailmap.c | 2 | ||||
| -rw-r--r-- | string-list.c | 6 | ||||
| -rw-r--r-- | string-list.h | 4 |
3 files changed, 6 insertions, 6 deletions
@@ -69,7 +69,7 @@ static void add_mapping(struct string_list *map, index = -1 - index; } else { /* create mailmap entry */ - struct string_list_item *item = string_list_insert_at_index(index, old_email, map); + struct string_list_item *item = string_list_insert_at_index(map, index, old_email); item->util = xmalloc(sizeof(struct mailmap_entry)); memset(item->util, 0, sizeof(struct mailmap_entry)); ((struct mailmap_entry *)item->util)->namemap.strdup_strings = 1; diff --git a/string-list.c b/string-list.c index de89efd2d8..84444c2c19 100644 --- a/string-list.c +++ b/string-list.c @@ -53,11 +53,11 @@ static int add_entry(int insert_at, struct string_list *list, const char *string struct string_list_item *string_list_insert(struct string_list *list, const char *string) { - return string_list_insert_at_index(-1, string, list); + return string_list_insert_at_index(list, -1, string); } -struct string_list_item *string_list_insert_at_index(int insert_at, - const char *string, struct string_list *list) +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); diff --git a/string-list.h b/string-list.h index 3d5a8de4b5..a4e1919ada 100644 --- a/string-list.h +++ b/string-list.h @@ -30,8 +30,8 @@ int string_list_has_string(const struct string_list *list, const char *string); int string_list_find_insert_index(const struct string_list *list, const char *string, int negative_existing_index); struct string_list_item *string_list_insert(struct string_list *list, const char *string); -struct string_list_item *string_list_insert_at_index(int insert_at, - const char *string, struct string_list *list); +struct string_list_item *string_list_insert_at_index(struct string_list *list, + int insert_at, const char *string); struct string_list_item *string_list_lookup(const char *string, struct string_list *list); /* Use these functions only on unsorted lists: */ |