credential: correct order of parameters for credential_match

[thirdparty/git.git] / sha1-lookup.c

diff --git a/sha1-lookup.c b/sha1-lookup.c
index 4cf3ebd9212f6d5c9b9829373e58c34b83f0a548..29185844ecd48d3d4ac7f838e97f3c02d42125f9 100644 (file)
--- a/sha1-lookup.c
+++ b/sha1-lookup.c
@@ -50,7 +50,7 @@ static uint32_t take2(const unsigned char *sha1)
  * The sha1 of element i (between 0 and nr - 1) should be returned
  * by "fn(i, table)".
  */
-int sha1_pos(const unsigned char *sha1, void *table, size_t nr,
+int sha1_pos(const unsigned char *hash, void *table, size_t nr,
             sha1_access_fn fn)
 {
        size_t hi = nr;
@@ -63,14 +63,14 @@ int sha1_pos(const unsigned char *sha1, void *table, size_t nr,
        if (nr != 1) {
                size_t lov, hiv, miv, ofs;
 
-               for (ofs = 0; ofs < 18; ofs += 2) {
+               for (ofs = 0; ofs < the_hash_algo->rawsz - 2; ofs += 2) {
                        lov = take2(fn(0, table) + ofs);
                        hiv = take2(fn(nr - 1, table) + ofs);
-                       miv = take2(sha1 + ofs);
+                       miv = take2(hash + ofs);
                        if (miv < lov)
                                return -1;
                        if (hiv < miv)
-                               return -1 - nr;
+                               return index_pos_to_insert_pos(nr);
                        if (lov != hiv) {
                                /*
                                 * At this point miv could be equal
@@ -81,14 +81,14 @@ int sha1_pos(const unsigned char *sha1, void *table, size_t nr,
                                mi = (nr - 1) * (miv - lov) / (hiv - lov);
                                if (lo <= mi && mi < hi)
                                        break;
-                               die("BUG: assertion failed in binary search");
+                               BUG("assertion failed in binary search");
                        }
                }
        }
 
        do {
                int cmp;
-               cmp = hashcmp(fn(mi, table), sha1);
+               cmp = hashcmp(fn(mi, table), hash);
                if (!cmp)
                        return mi;
                if (cmp > 0)
@@ -97,5 +97,33 @@ int sha1_pos(const unsigned char *sha1, void *table, size_t nr,
                        lo = mi + 1;
                mi = lo + (hi - lo) / 2;
        } while (lo < hi);
-       return -lo-1;
+       return index_pos_to_insert_pos(lo);
+}
+
+int bsearch_hash(const unsigned char *sha1, const uint32_t *fanout_nbo,
+                const unsigned char *table, size_t stride, uint32_t *result)
+{
+       uint32_t hi, lo;
+
+       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) {
+                       if (result)
+                               *result = mi;
+                       return 1;
+               }
+               if (cmp > 0)
+                       hi = mi;
+               else
+                       lo = mi + 1;
+       }
+
+       if (result)
+               *result = lo;
+       return 0;
 }