# [PATCH] wt-status.c: improve readability for wt_shortstatus_print 3 messages from 2017-03-16 to 2017-03-17. Participants: Stefan Beller, Jonathan Nieder, Junio C Hamano. Thread: https://gitlist.dev/t/45402 ## Stefan Beller, 2017-03-16 21:36 Subject: [PATCH] wt-status.c: improve readability for wt_shortstatus_print Message-ID: <20170316213619.30678-1-sbeller@google.com> URL: https://gitlist.dev/e/20170316213619.30678-1-sbeller%40google.com ``` Signed-off-by: Stefan Beller --- wt-status.c | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/wt-status.c b/wt-status.c index d47012048f..a52d342695 100644 --- a/wt-status.c +++ b/wt-status.c @@ -1785,34 +1785,24 @@ static void wt_shortstatus_print_tracking(struct wt_status *s) static void wt_shortstatus_print(struct wt_status *s) { - int i; + struct string_list_item *it; if (s->show_branch) wt_shortstatus_print_tracking(s); - for (i = 0; i < s->change.nr; i++) { - struct wt_status_change_data *d; - struct string_list_item *it; + for_each_string_list_item(it, &s->change) { + struct wt_status_change_data *d = it->util; - it = &(s->change.items[i]); - d = it->util; if (d->stagemask) wt_shortstatus_unmerged(it, s); else wt_shortstatus_status(it, s); } - for (i = 0; i < s->untracked.nr; i++) { - struct string_list_item *it; - - it = &(s->untracked.items[i]); + for_each_string_list_item(it, &s->untracked) 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, "!!"); - } } static void wt_porcelain_print(struct wt_status *s) -- 2.12.0.269.g1a05a5734c.dirty ``` ## Jonathan Nieder, 2017-03-16 22:51 Subject: Re: [PATCH] wt-status.c: improve readability for wt_shortstatus_print Message-ID: <20170316225108.GB9135@aiede.mtv.corp.google.com> URL: https://gitlist.dev/e/20170316225108.GB9135%40aiede.mtv.corp.google.com In-Reply-To: <20170316213619.30678-1-sbeller@google.com> ``` Stefan Beller wrote: > Subject: wt-status.c: improve readability for wt_shortstatus_print Maybe: 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 > --- > wt-status.c | 20 +++++--------------- > 1 file changed, 5 insertions(+), 15 deletions(-) I like the diffstat. :) With or without a clarified commit message, Reviewed-by: Jonathan Nieder ``` ## Junio C Hamano, 2017-03-17 05:25 Subject: Re: [PATCH] wt-status.c: improve readability for wt_shortstatus_print Message-ID: URL: https://gitlist.dev/e/xmqqd1dga30a.fsf%40gitster.mtv.corp.google.com In-Reply-To: <20170316225108.GB9135@aiede.mtv.corp.google.com> ``` Jonathan Nieder writes: > Stefan Beller wrote: > >> Subject: wt-status.c: improve readability for wt_shortstatus_print > > Maybe: > > 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. Much better. That matches what I read from the patch when I skimmed it, but it did leave me wondering if I missed something else. >> Signed-off-by: Stefan Beller >> --- >> wt-status.c | 20 +++++--------------- >> 1 file changed, 5 insertions(+), 15 deletions(-) > > I like the diffstat. :) Me too ;-) > > With or without a clarified commit message, > Reviewed-by: Jonathan Nieder ```