attr.c: rename arg name attr_nr to avoid shadowing the global one · submitgit/pretend-git@aa7710e · GitHub

submitgit / pretend-git Public

forked from git/git

• Notifications You must be signed in to change notification settings
• Fork 2
• Star 0

• Code
• Pull requests 3
• Actions
• Projects
• Security and quality
• Insights

Additional navigation options

Commit aa7710e

Browse filesBrowse the repository at this point in the historyBrowse files

pclouds

authored and

gitster

committed

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>

1 parent c2e8e4b commit aa7710e
Copy full SHA for aa7710e

1 file changed

+3-3Lines changed: 3 additions & 3 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• attr.c

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎attr.c‎

Copy file name to clipboardExpand all lines: attr.c

+3-3Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
@@ -681,21 +681,21 @@ static int fill(const char *path, int pathlen, int basename_offset,
681	681	return rem;
682	682	}
683	683
684		- static int macroexpand_one(int attr_nr, int rem)
	684	+ static int macroexpand_one(int nr, int rem)
685	685	{
686	686	struct attr_stack *stk;
687	687	struct match_attr *a = NULL;
688	688	int i;
689	689
690		- if (check_all_attr[attr_nr].value != ATTR__TRUE)
	690	+ if (check_all_attr[nr].value != ATTR__TRUE)
691	691	return rem;
692	692
693	693	for (stk = attr_stack; !a && stk; stk = stk->prev)
694	694	for (i = stk->num_matches - 1; !a && 0 <= i; i--) {
695	695	struct match_attr *ma = stk->attrs[i];
696	696	if (!ma->is_macro)
697	697	continue;
698		- if (ma->u.attr->attr_nr == attr_nr)
	698	+ if (ma->u.attr->attr_nr == nr)
699	699	a = ma;
700	700	}
701	701

0 commit comments

Comments

0 (0)