mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sha1-file: convert constants to uses of the_hash_algo

Browse Source 
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>
This commit is contained in:
brian m. carlson 2018-07-16 01:28:07 +00:00 committed by Junio C Hamano
parent 2ed1960a77
commit 94b5e093f9
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-file.c
View File

@ -336,7 +336,7 @@ int raceproof_create_file(const char *path, create_file_fn fn, void *cb)
static void fill_sha1_path(struct strbuf *buf, const unsigned char *sha1) static void fill_sha1_path(struct strbuf *buf, const unsigned char *sha1)
{ {
int i; int i;
for (i = 0; i < 20; i++) { for (i = 0; i < the_hash_algo->rawsz; i++) {
static char hex[] = "0123456789abcdef"; static char hex[] = "0123456789abcdef";
unsigned int val = sha1[i]; unsigned int val = sha1[i];
strbuf_addch(buf, hex[val >> 4]); strbuf_addch(buf, hex[val >> 4]);
@ -1473,7 +1473,7 @@ void *read_object_with_reference(const struct object_id *oid,
} }
ref_length = strlen(ref_type); ref_length = strlen(ref_type);
if (ref_length + GIT_SHA1_HEXSZ > isize || if (ref_length + the_hash_algo->hexsz > isize ||
memcmp(buffer, ref_type, ref_length) || memcmp(buffer, ref_type, ref_length) ||
get_oid_hex((char *) buffer + ref_length, &actual_oid)) { get_oid_hex((char *) buffer + ref_length, &actual_oid)) {
free(buffer); free(buffer);
@ -2062,9 +2062,9 @@ int for_each_file_in_obj_subdir(unsigned int subdir_nr,
namelen = strlen(de->d_name); namelen = strlen(de->d_name);
strbuf_setlen(path, baselen); strbuf_setlen(path, baselen);
strbuf_add(path, de->d_name, namelen); strbuf_add(path, de->d_name, namelen);
if (namelen == GIT_SHA1_HEXSZ - 2 && if (namelen == the_hash_algo->hexsz - 2 &&
!hex_to_bytes(oid.hash + 1, de->d_name, !hex_to_bytes(oid.hash + 1, de->d_name,
GIT_SHA1_RAWSZ - 1)) { the_hash_algo->rawsz - 1)) {
if (obj_cb) { if (obj_cb) {
r = obj_cb(&oid, path->buf, data); r = obj_cb(&oid, path->buf, data);
if (r) if (r)