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

string_list: Fix argument order for string_list_insert

Browse Source 
Update the definition and callers of string_list_insert 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:35 +01:00
committed by Junio C Hamano
parent b684e97736
commit 78a395d371
19 changed files with 40 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
merge-recursive.c
View File

@ -238,9 +238,9 @@ static int save_files_dirs(const unsigned char *sha1,
newpath[baselen + len] = '\0';
if (S_ISDIR(mode))
string_list_insert(newpath, &o->current_directory_set);
string_list_insert(&o->current_directory_set, newpath);
else
string_list_insert(newpath, &o->current_file_set);
string_list_insert(&o->current_file_set, newpath);
free(newpath);
return (S_ISDIR(mode) ? READ_TREE_RECURSIVE : 0);
@ -271,7 +271,7 @@ static struct stage_data *insert_stage_data(const char *path,
e->stages[2].sha, &e->stages[2].mode);
get_tree_entry(b->object.sha1, path,
e->stages[3].sha, &e->stages[3].mode);
item = string_list_insert(path, entries);
item = string_list_insert(entries, path);
item->util = e;
return e;
}
@ -296,7 +296,7 @@ static struct string_list *get_unmerged(void)
item = string_list_lookup(ce->name, unmerged);
if (!item) {
item = string_list_insert(ce->name, unmerged);
item = string_list_insert(unmerged, ce->name);
item->util = xcalloc(1, sizeof(struct stage_data));
}
e = item->util;
@ -369,7 +369,7 @@ static struct string_list *get_renames(struct merge_options *o,
o_tree, a_tree, b_tree, entries);
else
re->dst_entry = item->util;
item = string_list_insert(pair->one->path, renames);
item = string_list_insert(renames, pair->one->path);
item->util = re;
}
opts.output_format = DIFF_FORMAT_NO_OUTPUT;
@ -432,7 +432,7 @@ static char *unique_path(struct merge_options *o, const char *path, const char *
lstat(newpath, &st) == 0)
sprintf(p, "_%d", suffix++);
string_list_insert(newpath, &o->current_file_set);
string_list_insert(&o->current_file_set, newpath);
return newpath;
}
@ -811,12 +811,12 @@ static int process_renames(struct merge_options *o,
for (i = 0; i < a_renames->nr; i++) {
sre = a_renames->items[i].util;
string_list_insert(sre->pair->two->path, &a_by_dst)->util
string_list_insert(&a_by_dst, sre->pair->two->path)->util
= sre->dst_entry;
}
for (i = 0; i < b_renames->nr; i++) {
sre = b_renames->items[i].util;
string_list_insert(sre->pair->two->path, &b_by_dst)->util
string_list_insert(&b_by_dst, sre->pair->two->path)->util
= sre->dst_entry;
}