summaryrefslogtreecommitdiff
path: root/commit.c
diff options
context:
space:
mode:
authorBrandon Casey <drafnel@gmail.com>2009-08-27 16:16:34 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-08-27 23:21:23 (GMT)
commitf203d6969b7cfbb56460d5bf8e99b0a7d1abe03b (patch)
tree1d1eb9bbdc6549cc3b5195db9a45149f24ddd71e /commit.c
parent1630726e849b8b0f1802ad0681b94a64d4851a30 (diff)
downloadgit-f203d6969b7cfbb56460d5bf8e99b0a7d1abe03b.zip
git-f203d6969b7cfbb56460d5bf8e99b0a7d1abe03b.tar.gz
git-f203d6969b7cfbb56460d5bf8e99b0a7d1abe03b.tar.bz2
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>
Diffstat (limited to 'commit.c')
-rw-r--r--commit.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/commit.c b/commit.c
index e2bcbe8..a6c6f70 100644
--- a/commit.c
+++ b/commit.c
@@ -564,13 +564,13 @@ static struct commit_list *merge_bases_many(struct commit *one, int n, struct co
while (interesting(list)) {
struct commit *commit;
struct commit_list *parents;
- struct commit_list *n;
+ struct commit_list *next;
int flags;
commit = list->item;
- n = list->next;
+ next = list->next;
free(list);
- list = n;
+ list = next;
flags = commit->object.flags & (PARENT1 | PARENT2 | STALE);
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);
list = result; result = NULL;
while (list) {
- struct commit_list *n = list->next;
+ struct commit_list *next = list->next;
if (!(list->item->object.flags & STALE))
insert_by_date(list->item, &result);
free(list);
- list = n;
+ list = next;
}
return result;
}