Skip to content

Commit

Permalink
string_list: Fix argument order for string_list_insert_at_index
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Julian Phillips authored and Junio C Hamano committed Jun 27, 2010
1 parent 78a395d commit aadceea
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion mailmap.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions string-list.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
4 changes: 2 additions & 2 deletions string-list.h
Original file line number Diff line number Diff line change
Expand Up @@ -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: */
Expand Down

0 comments on commit aadceea

Please sign in to comment.