git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 3/4] bisect: use the new generic "sha1_pos" function to lookup sha1
@ 2009-04-04 20:59 Christian Couder
  0 siblings, 0 replies; only message in thread
From: Christian Couder @ 2009-04-04 20:59 UTC (permalink / raw)
  To: Junio C Hamano; +Cc: git, Johannes Schindelin

instead of the specific one that was simpler but less efficient.

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
---
 bisect.c |   23 +++++++++--------------
 1 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/bisect.c b/bisect.c
index affba41..336d611 100644
--- a/bisect.c
+++ b/bisect.c
@@ -5,6 +5,7 @@
 #include "refs.h"
 #include "list-objects.h"
 #include "quote.h"
+#include "sha1-lookup.h"
 #include "bisect.h"
 
 
@@ -461,22 +462,16 @@ static void prepare_skipped(void)
 	qsort(skipped_sha1, skipped_sha1_nr, sizeof(*skipped_sha1), skipcmp);
 }
 
+static const unsigned char *skipped_sha1_access(size_t index, void *table)
+{
+	unsigned char (*skipped)[20] = table;
+	return skipped[index];
+}
+
 static int lookup_skipped(unsigned char *sha1)
 {
-	int lo, hi;
-	lo = 0;
-	hi = skipped_sha1_nr;
-	while (lo < hi) {
-		int mi = (lo + hi) / 2;
-		int cmp = hashcmp(sha1, skipped_sha1[mi]);
-		if (!cmp)
-			return mi;
-		if (cmp < 0)
-			hi = mi;
-		else
-			lo = mi + 1;
-	}
-	return -lo - 1;
+	return sha1_pos(sha1, skipped_sha1, skipped_sha1_nr,
+			skipped_sha1_access);
 }
 
 struct commit_list *filter_skipped(struct commit_list *list,
-- 
1.6.2.2.404.ge96f3.dirty

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2009-04-04 21:02 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-04-04 20:59 [PATCH 3/4] bisect: use the new generic "sha1_pos" function to lookup sha1 Christian Couder

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).