kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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>
maint
Stefan Beller 2017-03-16 14:36:19 -07:00 committed by Junio C Hamano
parent 7c9c2f8c39
commit d4aae459cd
1 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
wt-status.c
View File

@ -1785,35 +1785,25 @@ static void wt_shortstatus_print_tracking(struct wt_status *s)


static void wt_shortstatus_print(struct wt_status *s) static void wt_shortstatus_print(struct wt_status *s)
{ {
int i; struct string_list_item *it;


if (s->show_branch) if (s->show_branch)
wt_shortstatus_print_tracking(s); wt_shortstatus_print_tracking(s);


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


it = &(s->change.items[i]);
d = it->util;
if (d->stagemask) if (d->stagemask)
wt_shortstatus_unmerged(it, s); wt_shortstatus_unmerged(it, s);
else else
wt_shortstatus_status(it, s); wt_shortstatus_status(it, s);
} }
for (i = 0; i < s->untracked.nr; i++) { for_each_string_list_item(it, &s->untracked)
struct string_list_item *it;

it = &(s->untracked.items[i]);
wt_shortstatus_other(it, s, "??"); wt_shortstatus_other(it, s, "??");
}
for (i = 0; i < s->ignored.nr; i++) {
struct string_list_item *it;


it = &(s->ignored.items[i]); for_each_string_list_item(it, &s->ignored)
wt_shortstatus_other(it, s, "!!"); wt_shortstatus_other(it, s, "!!");
} }
}


static void wt_porcelain_print(struct wt_status *s) static void wt_porcelain_print(struct wt_status *s)
{ {