From: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Date: Sat, 27 Dec 2014 23:39:46 +0000 (+0700)
Subject: attr.c: rename arg name attr_nr to avoid shadowing the global one
X-Git-Tag: v2.4.0-rc0~92^2~2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/aa7710e064a9ee644e1e86bd6f89193200ac4ccd?ds=sidebyside

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>
---

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;
 		}