Merge branch 'nm/tag-edit' into next

diff --git a/sha1-lookup.c b/sha1-lookup.c
index d11c5e526052e708a9a357ca4d4687d09467e382..8d0b1db3e27c99b80faa2867565de237581802f4 100644 (file)
--- a/sha1-lookup.c
+++ b/sha1-lookup.c
@@ -100,26 +100,30 @@ int sha1_pos(const unsigned char *sha1, void *table, size_t nr,
        return -lo-1;
 }
 
-int bsearch_hash(const unsigned char *sha1, const void *fanout_,
-                const void *table_, size_t stride)
+int bsearch_hash(const unsigned char *sha1, const uint32_t *fanout_nbo,
+                const unsigned char *table, size_t stride, uint32_t *result)
 {
-       const uint32_t *fanout = fanout_;
-       const unsigned char *table = table_;
-       int hi, lo;
+       uint32_t hi, lo;
 
-       hi = ntohl(fanout[*sha1]);
-       lo = ((*sha1 == 0x0) ? 0 : ntohl(fanout[*sha1 - 1]));
+       hi = ntohl(fanout_nbo[*sha1]);
+       lo = ((*sha1 == 0x0) ? 0 : ntohl(fanout_nbo[*sha1 - 1]));
 
        while (lo < hi) {
                unsigned mi = lo + (hi - lo) / 2;
                int cmp = hashcmp(table + mi * stride, sha1);
 
-               if (!cmp)
-                       return mi;
+               if (!cmp) {
+                       if (result)
+                               *result = mi;
+                       return 1;
+               }
                if (cmp > 0)
                        hi = mi;
                else
                        lo = mi + 1;
        }
-       return -lo - 1;
+
+       if (result)
+               *result = lo;
+       return 0;
 }