string_list: Fix argument order for for_each_string_list
Update the definition and callers of for_each_string_list 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>
Julian Phillips committed
Jun 26, 2010 at 00:41 UTC
b684e977363ee5cb53d83c69f2298d7898c5f89a
7 files changed
+18
-18
builtin/fetch.c
+1
-1
@@ -633,7 +633,7 @@ static void find_non_local_tags(struct transport *transport,
633
* For all the tags in the remote_refs string list, call
634
* add_to_tail to add them to the list of refs to be fetched
635
*/
636
- for_each_string_list(add_to_tail, &remote_refs, &data);
636
+ for_each_string_list(&remote_refs, add_to_tail, &data);
637
638
string_list_clear(&remote_refs, 0);
639
}
builtin/ls-files.c
+1
-1
@@ -186,7 +186,7 @@ static void show_ru_info(const char *prefix)
186
{
187
if (!the_index.resolve_undo)
188
return;
189
- for_each_string_list(show_one_ru, the_index.resolve_undo, NULL);
189
+ for_each_string_list(the_index.resolve_undo, show_one_ru, NULL);
190
}
191
192
static void show_files(struct dir_struct *dir, const char *prefix)
builtin/remote.c
+8
-8
@@ -1081,24 +1081,24 @@ static int show(int argc, const char **argv)
1081
1082
/* remote branch info */
1083
info.width = 0;
1084
- for_each_string_list(add_remote_to_show_info, &states.new, &info);
1085
- for_each_string_list(add_remote_to_show_info, &states.tracked, &info);
1086
- for_each_string_list(add_remote_to_show_info, &states.stale, &info);
1084
+ for_each_string_list(&states.new, add_remote_to_show_info, &info);
1085
+ for_each_string_list(&states.tracked, add_remote_to_show_info, &info);
1086
+ for_each_string_list(&states.stale, add_remote_to_show_info, &info);
1087
if (info.list->nr)
1088
printf(" Remote branch%s:%s\n",
1089
info.list->nr > 1 ? "es" : "",
1090
no_query ? " (status not queried)" : "");
1091
- for_each_string_list(show_remote_info_item, info.list, &info);
1091
+ for_each_string_list(info.list, show_remote_info_item, &info);
1092
string_list_clear(info.list, 0);
1093
1094
/* git pull info */
1095
info.width = 0;
1096
info.any_rebase = 0;
1097
- for_each_string_list(add_local_to_show_info, &branch_list, &info);
1097
+ for_each_string_list(&branch_list, add_local_to_show_info, &info);
1098
if (info.list->nr)
1099
printf(" Local branch%s configured for 'git pull':\n",
1100
info.list->nr > 1 ? "es" : "");
1101
- for_each_string_list(show_local_info_item, info.list, &info);
1101
+ for_each_string_list(info.list, show_local_info_item, &info);
1102
string_list_clear(info.list, 0);
1103
1104
/* git push info */
@@ -1106,14 +1106,14 @@ static int show(int argc, const char **argv)
1106
printf(" Local refs will be mirrored by 'git push'\n");
1107
1108
info.width = info.width2 = 0;
1109
- for_each_string_list(add_push_to_show_info, &states.push, &info);
1109
+ for_each_string_list(&states.push, add_push_to_show_info, &info);
1110
qsort(info.list->items, info.list->nr,
1111
sizeof(*info.list->items), cmp_string_with_push);
1112
if (info.list->nr)
1113
printf(" Local ref%s configured for 'git push'%s:\n",
1114
info.list->nr > 1 ? "s" : "",
1115
no_query ? " (status not queried)" : "");
1116
- for_each_string_list(show_push_info_item, info.list, &info);
1116
+ for_each_string_list(info.list, show_push_info_item, &info);
1117
string_list_clear(info.list, 0);
1118
1119
free_remote_ref_states(&states);
notes.c
+3
-3
@@ -969,7 +969,7 @@ struct notes_tree **load_notes_trees(struct string_list *refs)
969
trees = xmalloc((refs->nr+1) * sizeof(struct notes_tree *));
970
cb_data.counter = 0;
971
cb_data.trees = trees;
972
- for_each_string_list(load_one_display_note_ref, refs, &cb_data);
972
+ for_each_string_list(refs, load_one_display_note_ref, &cb_data);
973
trees[cb_data.counter] = NULL;
974
return trees;
975
}
@@ -996,8 +996,8 @@ void init_display_notes(struct display_notes_opt *opt)
996
git_config(notes_display_config, &load_config_refs);
997
998
if (opt && opt->extra_notes_refs)
999
- for_each_string_list(string_list_add_refs_from_list,
1000
- opt->extra_notes_refs,
999
+ for_each_string_list(opt->extra_notes_refs,
1000
+ string_list_add_refs_from_list,
1001
&display_notes_refs);
1002
1003
display_notes_trees = load_notes_trees(&display_notes_refs);
resolve-undo.c
+1
-1
@@ -50,7 +50,7 @@ static int write_one(struct string_list_item *item, void *cbdata)
50
51
void resolve_undo_write(struct strbuf *sb, struct string_list *resolve_undo)
52
{
53
- for_each_string_list(write_one, resolve_undo, sb);
53
+ for_each_string_list(resolve_undo, write_one, sb);
54
}
55
56
struct string_list *resolve_undo_read(const char *data, unsigned long size)
string-list.c
+2
-2
@@ -92,8 +92,8 @@ struct string_list_item *string_list_lookup(const char *string, struct string_li
92
return list->items + i;
93
}
94
95
-int for_each_string_list(string_list_each_func_t fn,
96
- struct string_list *list, void *cb_data)
95
+int for_each_string_list(struct string_list *list,
96
+ string_list_each_func_t fn, void *cb_data)
97
{
98
int i, ret = 0;
99
for (i = 0; i < list->nr; i++)
string-list.h
+2
-2
@@ -22,8 +22,8 @@ void string_list_clear_func(struct string_list *list, string_list_clear_func_t c
22
23
/* Use this function to iterate over each item */
24
typedef int (*string_list_each_func_t)(struct string_list_item *, void *);
25
-int for_each_string_list(string_list_each_func_t,
26
- struct string_list *list, void *cb_data);
25
+int for_each_string_list(struct string_list *list,
26
+ string_list_each_func_t, void *cb_data);
27
28
/* Use these functions only on sorted lists: */
29
int string_list_has_string(const struct string_list *list, const char *string);