Skip to content

Commit e3c551d

Browse files
committed
Merge branch 'sb/wt-status-cleanup' into maint
Code clean-up. * sb/wt-status-cleanup: wt-status: simplify by using for_each_string_list_item
2 parents ba5e05f + d4aae45 commit e3c551d

File tree

1 file changed

+5
-15
lines changed

1 file changed

+5
-15
lines changed

wt-status.c

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1785,34 +1785,24 @@ static void wt_shortstatus_print_tracking(struct wt_status *s)
17851785

17861786
static void wt_shortstatus_print(struct wt_status *s)
17871787
{
1788-
int i;
1788+
struct string_list_item *it;
17891789

17901790
if (s->show_branch)
17911791
wt_shortstatus_print_tracking(s);
17921792

1793-
for (i = 0; i < s->change.nr; i++) {
1794-
struct wt_status_change_data *d;
1795-
struct string_list_item *it;
1793+
for_each_string_list_item(it, &s->change) {
1794+
struct wt_status_change_data *d = it->util;
17961795

1797-
it = &(s->change.items[i]);
1798-
d = it->util;
17991796
if (d->stagemask)
18001797
wt_shortstatus_unmerged(it, s);
18011798
else
18021799
wt_shortstatus_status(it, s);
18031800
}
1804-
for (i = 0; i < s->untracked.nr; i++) {
1805-
struct string_list_item *it;
1806-
1807-
it = &(s->untracked.items[i]);
1801+
for_each_string_list_item(it, &s->untracked)
18081802
wt_shortstatus_other(it, s, "??");
1809-
}
1810-
for (i = 0; i < s->ignored.nr; i++) {
1811-
struct string_list_item *it;
18121803

1813-
it = &(s->ignored.items[i]);
1804+
for_each_string_list_item(it, &s->ignored)
18141805
wt_shortstatus_other(it, s, "!!");
1815-
}
18161806
}
18171807

18181808
static void wt_porcelain_print(struct wt_status *s)

0 commit comments

Comments
 (0)