From aa7710e064a9ee644e1e86bd6f89193200ac4ccd Mon Sep 17 00:00:00 2001 From: =?utf8?q?Nguy=E1=BB=85n=20Th=C3=A1i=20Ng=E1=BB=8Dc=20Duy?= Date: Sun, 28 Dec 2014 06:39:46 +0700 Subject: [PATCH] attr.c: rename arg name attr_nr to avoid shadowing the global one MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Helped-by: Junio C Hamano Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano --- attr.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/attr.c b/attr.c index cd5469770a..a1758bf537 100644 --- a/attr.c +++ b/attr.c @@ -681,13 +681,13 @@ static int fill(const char *path, int pathlen, int basename_offset, return rem; } -static int macroexpand_one(int attr_nr, int rem) +static int macroexpand_one(int nr, int rem) { struct attr_stack *stk; struct match_attr *a = NULL; int i; - if (check_all_attr[attr_nr].value != ATTR__TRUE) + if (check_all_attr[nr].value != ATTR__TRUE) return rem; for (stk = attr_stack; !a && stk; stk = stk->prev) @@ -695,7 +695,7 @@ static int macroexpand_one(int attr_nr, int rem) struct match_attr *ma = stk->attrs[i]; if (!ma->is_macro) continue; - if (ma->u.attr->attr_nr == attr_nr) + if (ma->u.attr->attr_nr == nr) a = ma; } -- 2.11.4.GIT