sha1-file: convert constants to uses of the_hash_algo
Convert one use of 20 and several uses of GIT_SHA1_HEXSZ into references to the_hash_algo. Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
brian m. carlson committed
Jul 16, 2018 at 01:28 UTC
94b5e093f9434ab77dd0ccb5a6dd2cd3a94e7de5
1 file changed
+4
-4
sha1-file.c
+4
-4
@@ -336,7 +336,7 @@ out:
336
static void fill_sha1_path(struct strbuf *buf, const unsigned char *sha1)
337
{
338
int i;
339
- for (i = 0; i < 20; i++) {
339
+ for (i = 0; i < the_hash_algo->rawsz; i++) {
340
static char hex[] = "0123456789abcdef";
341
unsigned int val = sha1[i];
342
strbuf_addch(buf, hex[val >> 4]);
@@ -1473,7 +1473,7 @@ void *read_object_with_reference(const struct object_id *oid,
1473
}
1474
ref_length = strlen(ref_type);
1475
1476
- if (ref_length + GIT_SHA1_HEXSZ > isize ||
1476
+ if (ref_length + the_hash_algo->hexsz > isize ||
1477
memcmp(buffer, ref_type, ref_length) ||
1478
get_oid_hex((char *) buffer + ref_length, &actual_oid)) {
1479
free(buffer);
@@ -2062,9 +2062,9 @@ int for_each_file_in_obj_subdir(unsigned int subdir_nr,
2062
namelen = strlen(de->d_name);
2063
strbuf_setlen(path, baselen);
2064
strbuf_add(path, de->d_name, namelen);
2065
- if (namelen == GIT_SHA1_HEXSZ - 2 &&
2065
+ if (namelen == the_hash_algo->hexsz - 2 &&
2066
!hex_to_bytes(oid.hash + 1, de->d_name,
2067
- GIT_SHA1_RAWSZ - 1)) {
2067
+ the_hash_algo->rawsz - 1)) {
2068
if (obj_cb) {
2069
r = obj_cb(&oid, path->buf, data);
2070
if (r)