wt-status: simplify by using for_each_string_list_item
Improve readability by using the for_each_string_list_item helper instead of manually iterating with an integer counter. Signed-off-by: Stefan Beller <sbeller@google.com> Reviewed-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Stefan Beller committed
Mar 16, 2017 at 14:36 UTC
d4aae459cd217c9201e03b270112f5b3ead1f867
1 file changed
+5
-15
wt-status.c
+5
-15
@@ -1785,34 +1785,24 @@ static void wt_shortstatus_print_tracking(struct wt_status *s)
1785
1786
static void wt_shortstatus_print(struct wt_status *s)
1787
{
1788
- int i;
1788
+ struct string_list_item *it;
1789
1790
if (s->show_branch)
1791
wt_shortstatus_print_tracking(s);
1792
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;
1795
1797
- it = &(s->change.items[i]);
1798
- d = it->util;
1796
if (d->stagemask)
1797
wt_shortstatus_unmerged(it, s);
1798
else
1799
wt_shortstatus_status(it, s);
1800
}
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)
1802
wt_shortstatus_other(it, s, "??");
1809
- }
1810
- for (i = 0; i < s->ignored.nr; i++) {
1811
- struct string_list_item *it;
1803
1813
- it = &(s->ignored.items[i]);
1804
+ for_each_string_list_item(it, &s->ignored)
1805
wt_shortstatus_other(it, s, "!!");
1815
- }
1806
}
1807
1808
static void wt_porcelain_print(struct wt_status *s)