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

Merge branch 'jp/string-list-api-cleanup'

Browse Source 
* jp/string-list-api-cleanup:
  string_list: Fix argument order for string_list_append
  string_list: Fix argument order for string_list_lookup
  string_list: Fix argument order for string_list_insert_at_index
  string_list: Fix argument order for string_list_insert
  string_list: Fix argument order for for_each_string_list
  string_list: Fix argument order for print_string_list
This commit is contained in:
Junio C Hamano
2010-06-30 11:55:38 -07:00
parent 6296062285 1d2f80fa79
commit a53deac89e
29 changed files with 147 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
builtin/fmt-merge-msg.c
View File

@ -82,7 +82,7 @@ static int handle_line(char *line)
item = unsorted_string_list_lookup(&srcs, src);
if (!item) {
item = string_list_append(src, &srcs);
item = string_list_append(&srcs, src);
item->util = xcalloc(1, sizeof(struct src_data));
init_src_data(item->util);
}
@ -93,19 +93,19 @@ static int handle_line(char *line)
src_data->head_status |= 1;
} else if (!prefixcmp(line, "branch ")) {
origin = line + 7;
string_list_append(origin, &src_data->branch);
string_list_append(&src_data->branch, origin);
src_data->head_status |= 2;
} else if (!prefixcmp(line, "tag ")) {
origin = line;
string_list_append(origin + 4, &src_data->tag);
string_list_append(&src_data->tag, origin + 4);
src_data->head_status |= 2;
} else if (!prefixcmp(line, "remote branch ")) {
origin = line + 14;
string_list_append(origin, &src_data->r_branch);
string_list_append(&src_data->r_branch, origin);
src_data->head_status |= 2;
} else {
origin = src;
string_list_append(line, &src_data->generic);
string_list_append(&src_data->generic, line);
src_data->head_status |= 2;
}
@ -118,7 +118,7 @@ static int handle_line(char *line)
sprintf(new_origin, "%s of %s", origin, src);
origin = new_origin;
}
string_list_append(origin, &origins)->util = sha1;
string_list_append(&origins, origin)->util = sha1;
return 0;
}
@ -176,10 +176,10 @@ static void shortlog(const char *name, unsigned char *sha1,
strbuf_ltrim(&sb);
if (!sb.len)
string_list_append(sha1_to_hex(commit->object.sha1),
&subjects);
string_list_append(&subjects,
sha1_to_hex(commit->object.sha1));
else
string_list_append(strbuf_detach(&sb, NULL), &subjects);
string_list_append(&subjects, strbuf_detach(&sb, NULL));
}
if (count > limit)