Skip to contentSkip to conversation

wt-status.c: improve readability for wt_shortstatus_print

PATCH In review Stefan Beller 3 participants 3 messages Mar 16, 2017 – Mar 17, 2017

lore
Share & tools
lore

Stefan Beller

author
#0 lore raw

PATCH 1/1 wt-status.c: improve readability for wt_shortstatus_print

Signed-off-by Stefan Beller <[email protected]>
---
 wt-status.c | 20 +++++---------------
 1 file changed, 5 insertions(+), 15 deletions(-)
wt-status.c +5 -15
index d47012048f..a52d342695 100644
@@ -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)
Signature · 1 line
2.12.0.269.g1a05a5734c.dirty
Reviewed-by on v1 1/1
#1 lore raw
Quoted 1 line · Stefan Beller

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.

Quoted 4 lines
Signed-off-by Stefan Beller <[email protected]>
---
 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 <[email protected]>
#2 lore raw
Quoted 10 lines · Jonathan Nieder
Quoted 1 line · Stefan Beller

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.

Quoted 6 lines
Quoted 4 lines
Signed-off-by Stefan Beller <[email protected]>
---
 wt-status.c | 20 +++++---------------
 1 file changed, 5 insertions(+), 15 deletions(-)

I like the diffstat. :)

Me too ;-)

Quoted 3 lines

With or without a clarified commit message,

Reviewed-by Jonathan Nieder <[email protected]>