kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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>
maint
brian m. carlson 2019-08-18 20:04:14 +00:00 committed by Junio C Hamano
parent fe9fec45f6
commit e84f3572bd
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sha1-lookup.c
View File

@ -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 * The sha1 of element i (between 0 and nr - 1) should be returned
* by "fn(i, table)". * 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) sha1_access_fn fn)
{ {
size_t hi = nr; size_t hi = nr;
@ -63,10 +63,10 @@ int sha1_pos(const unsigned char *sha1, void *table, size_t nr,
if (nr != 1) { if (nr != 1) {
size_t lov, hiv, miv, ofs; 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); lov = take2(fn(0, table) + ofs);
hiv = take2(fn(nr - 1, table) + ofs); hiv = take2(fn(nr - 1, table) + ofs);
miv = take2(sha1 + ofs); miv = take2(hash + ofs);
if (miv < lov) if (miv < lov)
return -1; return -1;
if (hiv < miv) if (hiv < miv)
@ -88,7 +88,7 @@ int sha1_pos(const unsigned char *sha1, void *table, size_t nr,


do { do {
int cmp; int cmp;
cmp = hashcmp(fn(mi, table), sha1); cmp = hashcmp(fn(mi, table), hash);
if (!cmp) if (!cmp)
return mi; return mi;
if (cmp > 0) if (cmp > 0)