[PATCH v2 07/12] attr.c: simplify macroexpand_one()
- From
Junio C Hamano <gitster@pobox.com>
- Date
- May 16, 2016, 21:05 UTC
- Message-ID
- <20160516210545.6591-8-gitster@pobox.com>
- In-Reply-To
- <20160516210545.6591-1-gitster@pobox.com>
The double-loop wants to do an early return immediately when one matching macro is found. Eliminate the extra variable 'a' used for that purpose and rewrite the "assign the found item to 'a' to make it non-NULL and force the loop(s) to terminate" with a direct return from there.
Signed-off-by: Junio C Hamano <gitster@pobox.com> --- attr.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/attr.c b/attr.c index 95416d3..7bfeef3 100644 --- a/attr.c +++ b/attr.c @@ -701,24 +701,21 @@ static int fill(const char *path, int pathlen, int basename_offset, static int macroexpand_one(int nr, int rem) { struct attr_stack *stk; - struct match_attr *a = NULL; int i; if (check_all_attr[nr].value != ATTR__TRUE || !check_all_attr[nr].attr->maybe_macro) return rem; - for (stk = attr_stack; !a && stk; stk = stk->prev) - for (i = stk->num_matches - 1; !a && 0 <= i; i--) { + for (stk = attr_stack; stk; stk = stk->prev) { + for (i = stk->num_matches - 1; 0 <= i; i--) { struct match_attr *ma = stk->attrs[i]; if (!ma->is_macro) continue; if (ma->u.attr->attr_nr == nr) - a = ma; + return fill_one("expand", ma, rem); } - - if (a) - rem = fill_one("expand", a, rem); + } return rem; }
-- 2.8.2-748-gfb85f76