sha1-lookup: switch hard-coded constants to the_hash_algo

Switch a hard-coded 18 to be a reference to the_hash_algo.  Rename the
sha1 parameter to be called hash instead.

Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/sha1-lookup.c b/sha1-lookup.c
index 796ab68da83c3a36ec87fa45bfa18f5d0508a947..93d9af0805c0b730a8723e90c1daef033ef30630 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,10 +63,10 @@ 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)
@@ -88,7 +88,7 @@ int sha1_pos(const unsigned char *sha1, void *table, size_t nr,
 
        do {
                int cmp;
-               cmp = hashcmp(fn(mi, table), sha1);
+               cmp = hashcmp(fn(mi, table), hash);
                if (!cmp)
                        return mi;
                if (cmp > 0)