[PATCH] refactor commit_graft_pos using general sha1_pos function

From

Jjackylee <jacky.liye@gmail.com>

Date

Feb 26, 2010, 16:31 UTC

Message-ID

<4B87F753.7040603@gmail.com>

Signed-off-by: Li Ye <jacky.liye@gmail.com>
---
 commit.c |   23 +++++++----------------
 1 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/commit.c b/commit.c
index 731191e..c44d091 100644
--- a/commit.c
+++ b/commit.c
@@ -6,6 +6,7 @@
 #include "diff.h"
 #include "revision.h"
 #include "notes.h"
+#include "sha1-lookup.h"
 
 int save_commit_buffer = 1;
 
@@ -78,24 +79,14 @@ static unsigned long parse_commit_date(const char *buf, const char *tail)
 
 static struct commit_graft **commit_graft;
 static int commit_graft_alloc, commit_graft_nr;
-
+static const unsigned char *commit_graft_access(size_t index, void *table)
+{
+	struct commit_graft **grafts = table;
+	return (const unsigned char *)grafts[index];
+}
 static int commit_graft_pos(const unsigned char *sha1)
 {
-	int lo, hi;
-	lo = 0;
-	hi = commit_graft_nr;
-	while (lo < hi) {
-		int mi = (lo + hi) / 2;
-		struct commit_graft *graft = commit_graft[mi];
-		int cmp = hashcmp(sha1, graft->sha1);
-		if (!cmp)
-			return mi;
-		if (cmp < 0)
-			hi = mi;
-		else
-			lo = mi + 1;
-	}
-	return -lo - 1;
+	return sha1_pos(sha1, commit_graft, commit_graft_nr, commit_graft_access);
 }
 
 int register_commit_graft(struct commit_graft *graft, int ignore_dups)

-- 
1.6.3.3