attr.c: rename arg name attr_nr to avoid shadowing the global one
Helped-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Nguyễn Thái Ngọc Duy committed
Dec 28, 2014 at 06:39 UTC
aa7710e064a9ee644e1e86bd6f89193200ac4ccd
1 file changed
+3
-3
attr.c
+3
-3
@@ -681,13 +681,13 @@ static int fill(const char *path, int pathlen, int basename_offset,
681
return rem;
682
}
683
684
-static int macroexpand_one(int attr_nr, int rem)
684
+static int macroexpand_one(int nr, int rem)
685
{
686
struct attr_stack *stk;
687
struct match_attr *a = NULL;
688
int i;
689
690
- if (check_all_attr[attr_nr].value != ATTR__TRUE)
690
+ if (check_all_attr[nr].value != ATTR__TRUE)
691
return rem;
692
693
for (stk = attr_stack; !a && stk; stk = stk->prev)
@@ -695,7 +695,7 @@ static int macroexpand_one(int attr_nr, int rem)
695
struct match_attr *ma = stk->attrs[i];
696
if (!ma->is_macro)
697
continue;
698
- if (ma->u.attr->attr_nr == attr_nr)
698
+ if (ma->u.attr->attr_nr == nr)
699
a = ma;
700
}
701