sequencer: break out of loop explicitly

It came up in review [1, 2] that this non-idiomatic loop is a bit tricky. When we find a space, we set `len = i`, which gives us the answer we are looking for, but which also breaks out of the loop. It turns out that this loop can confuse compilers as well. My copy of gcc 7.3.0 realizes that we are essentially evaluating `(len + 1) < len` and warns that the behavior is undefined if `len` is `INT_MAX`. (Because the assignment `len = i` is guaranteed to decrease `len`, such undefined behavior is not actually possible.) Rewrite the loop to a more idiomatic variant which doesn't muck with `len` in the loop body. That should help compilers and human readers figure out what is going on here. But do note that we need to update `len` since it is not only used just after this loop (where we could have used `i` directly), but also later in this function. While at it, reduce the scope of `i`. [1] https://public-inbox.org/git/CAPig+cQbG2s-LrAo9+7C7=dXifbWFJ3SzuNa-QePHDk7egK=jg@mail.gmail.com/ [2] https://public-inbox.org/git/CAPig+cRjU6niXpT2FrDWZ0x1HmGf1ojVZj3uk2qXEGe-S7i_HQ@mail.gmail.com/ Helped-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Martin Ågren <martin.agren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Martin Ågren committed Oct 30, 2018 at 09:09 UTC 71571cd7d61b2e5c90684322b38e60ffadd33448
1 file changed +5 -2
sequencer.c
+5 -2
@@ -2825,7 +2825,7 @@ static int do_reset(const char *name, int len, struct replay_opts *opts)
2825 struct tree_desc desc;
2826 struct tree *tree;
2827 struct unpack_trees_options unpack_tree_opts;
2828 - int ret = 0, i;
2828 + int ret = 0;
2829
2830 if (hold_locked_index(&lock, LOCK_REPORT_ON_ERROR) < 0)
2831 return -1;
@@ -2845,10 +2845,13 @@ static int do_reset(const char *name, int len, struct replay_opts *opts)
2845 }
2846 oidcpy(&oid, &opts->squash_onto);
2847 } else {
2848 + int i;
2849 +
2850 /* Determine the length of the label */
2851 for (i = 0; i < len; i++)
2852 if (isspace(name[i]))
2851 - len = i;
2853 + break;
2854 + len = i;
2855
2856 strbuf_addf(&ref_name, "refs/rewritten/%.*s", len, name);
2857 if (get_oid(ref_name.buf, &oid) &&