commit.c: rename variable named 'n' which masks previous declaration

The variable named 'n' was initially declared to be of type int.  The name
'n' was reused inside inner blocks as a different type.  Rename the uses
within inner blocks to avoid confusion and give them a slightly more
descriptive name.

Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Brandon Casey 2009-08-27 11:16:34 -05:00 коммит произвёл Junio C Hamano
Родитель 1630726e84
Коммит f203d6969b
1 изменённых файлов: 5 добавлений и 5 удалений

Просмотреть файл

@ -564,13 +564,13 @@ static struct commit_list *merge_bases_many(struct commit *one, int n, struct co
while (interesting(list)) { while (interesting(list)) {
struct commit *commit; struct commit *commit;
struct commit_list *parents; struct commit_list *parents;
struct commit_list *n; struct commit_list *next;
int flags; int flags;
commit = list->item; commit = list->item;
n = list->next; next = list->next;
free(list); free(list);
list = n; list = next;
flags = commit->object.flags & (PARENT1 | PARENT2 | STALE); flags = commit->object.flags & (PARENT1 | PARENT2 | STALE);
if (flags == (PARENT1 | PARENT2)) { if (flags == (PARENT1 | PARENT2)) {
@ -598,11 +598,11 @@ static struct commit_list *merge_bases_many(struct commit *one, int n, struct co
free_commit_list(list); free_commit_list(list);
list = result; result = NULL; list = result; result = NULL;
while (list) { while (list) {
struct commit_list *n = list->next; struct commit_list *next = list->next;
if (!(list->item->object.flags & STALE)) if (!(list->item->object.flags & STALE))
insert_by_date(list->item, &result); insert_by_date(list->item, &result);
free(list); free(list);
list = n; list = next;
} }
return result; return result;
} }