aboutsummaryrefslogtreecommitdiff
path: root/merge-base.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org>2005-05-20 11:46:10 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-05-20 11:46:10 -0700
commite99d59ff0bff349ef205cef1076e0354c8130680 (patch)
tree530ca0d4db45176dad22016af0e2d61c2a321c70 /merge-base.c
parent7ca45252a35df8c78060ff233957fc558714a5d6 (diff)
downloadgit-e99d59ff0bff349ef205cef1076e0354c8130680.tar.gz
git-e99d59ff0bff349ef205cef1076e0354c8130680.tar.xz
sparse cleanup
Fix various things that sparse complains about: - use NULL instead of 0 - make sure we declare everything properly, or mark it static - use proper function declarations ("fn(void)" instead of "fn()") Sparse is always right.
Diffstat (limited to 'merge-base.c')
-rw-r--r--merge-base.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/merge-base.c b/merge-base.c
index 04f40fc8c..12ebb95fb 100644
--- a/merge-base.c
+++ b/merge-base.c
@@ -15,7 +15,7 @@ static struct commit *process_list(struct commit_list **list_p, int this_mark,
return NULL;
}
-struct commit *common_ancestor(struct commit *rev1, struct commit *rev2)
+static struct commit *common_ancestor(struct commit *rev1, struct commit *rev2)
{
struct commit_list *rev1list = NULL;
struct commit_list *rev2list = NULL;