mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

string_list: Fix argument order for string_list_insert_at_index

Browse Source 
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>
This commit is contained in:
Julian Phillips
2010-06-26 00:41:36 +01:00
committed by Junio C Hamano
parent 78a395d371
commit aadceea641
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mailmap.c
View File

@ -69,7 +69,7 @@ static void add_mapping(struct string_list *map,
index = -1 - index; index = -1 - index;
} else { } else {
/* create mailmap entry */ /* 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)); item->util = xmalloc(sizeof(struct mailmap_entry));
memset(item->util, 0, sizeof(struct mailmap_entry)); memset(item->util, 0, sizeof(struct mailmap_entry));
((struct mailmap_entry *)item->util)->namemap.strdup_strings = 1; ((struct mailmap_entry *)item->util)->namemap.strdup_strings = 1;

6
string-list.c
View File

@ -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) 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, struct string_list_item *string_list_insert_at_index(struct string_list *list,
const char *string, struct string_list *list) int insert_at, const char *string)
{ {
int index = add_entry(insert_at, list, string); int index = add_entry(insert_at, list, string);

4
string-list.h
View File

@ -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 string_list_find_insert_index(const struct string_list *list, const char *string,
int negative_existing_index); 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(struct string_list *list, const char *string);
struct string_list_item *string_list_insert_at_index(int insert_at, struct string_list_item *string_list_insert_at_index(struct string_list *list,
const char *string, struct string_list *list); int insert_at, const char *string);
struct string_list_item *string_list_lookup(const char *string, struct string_list *list); struct string_list_item *string_list_lookup(const char *string, struct string_list *list);
/* Use these functions only on unsorted lists: */ /* Use these functions only on unsorted lists: */