commit aa7710e064a9ee644e1e86bd6f89193200ac4ccd
author Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Sun Dec 28 06:39:46 2014 +0700
committer Junio C Hamano <gitster@pobox.com> Mon Dec 29 12:40:42 2014 -0800
tree e11a470af61f60e05bf39ca3f654c9e93aedf761
parent c2e8e4b9da4d007b15faa2e3d407b2fd279f0572

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>

attr.c

diff --git a/attr.c b/attr.c
index cd54697..a1758bf 100644
--- a/attr.c
+++ b/attr.c
@@ -681,13 +681,13 @@
 	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 @@
 			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;
 		}