summaryrefslogtreecommitdiff
path: root/wt-status.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-06-30 18:55:38 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-06-30 18:55:38 (GMT)
commita53deac89eb6c65cd953c730f33b86ac3f72d647 (patch)
tree69394607c1f6b8a0c5c53207a747fe31d79f0c79 /wt-status.c
parent6296062285e07051a5a46cbbd74c67a10bf2ac16 (diff)
parent1d2f80fa79cdc6f7f4fa1cefb47d7d19be3bc5ee (diff)
downloadgit-a53deac89eb6c65cd953c730f33b86ac3f72d647.zip
git-a53deac89eb6c65cd953c730f33b86ac3f72d647.tar.gz
git-a53deac89eb6c65cd953c730f33b86ac3f72d647.tar.bz2
Merge branch 'jp/string-list-api-cleanup'
* 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
Diffstat (limited to 'wt-status.c')
-rw-r--r--wt-status.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/wt-status.c b/wt-status.c
index 9d9cb95..38754ad 100644
--- a/wt-status.c
+++ b/wt-status.c
@@ -235,7 +235,7 @@ static void wt_status_collect_changed_cb(struct diff_queue_struct *q,
struct wt_status_change_data *d;
p = q->queue[i];
- it = string_list_insert(p->one->path, &s->change);
+ it = string_list_insert(&s->change, p->one->path);
d = it->util;
if (!d) {
d = xcalloc(1, sizeof(*d));
@@ -282,7 +282,7 @@ static void wt_status_collect_updated_cb(struct diff_queue_struct *q,
struct wt_status_change_data *d;
p = q->queue[i];
- it = string_list_insert(p->two->path, &s->change);
+ it = string_list_insert(&s->change, p->two->path);
d = it->util;
if (!d) {
d = xcalloc(1, sizeof(*d));
@@ -349,7 +349,7 @@ static void wt_status_collect_changes_initial(struct wt_status *s)
if (!ce_path_match(ce, s->pathspec))
continue;
- it = string_list_insert(ce->name, &s->change);
+ it = string_list_insert(&s->change, ce->name);
d = it->util;
if (!d) {
d = xcalloc(1, sizeof(*d));
@@ -384,7 +384,7 @@ static void wt_status_collect_untracked(struct wt_status *s)
continue;
if (!match_pathspec(s->pathspec, ent->name, ent->len, 0, NULL))
continue;
- string_list_insert(ent->name, &s->untracked);
+ string_list_insert(&s->untracked, ent->name);
free(ent);
}
@@ -398,7 +398,7 @@ static void wt_status_collect_untracked(struct wt_status *s)
continue;
if (!match_pathspec(s->pathspec, ent->name, ent->len, 0, NULL))
continue;
- string_list_insert(ent->name, &s->ignored);
+ string_list_insert(&s->ignored, ent->name);
free(ent);
}
}