undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refs/packed-backend: express constants using the_hash_algo

Browse Source 
Switch uses of GIT_SHA1_HEXSZ to use the_hash_algo so that they are
appropriate for the any given hash length.

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-10-15 00:01:55 +00:00 committed by Junio C Hamano
parent 268babd6fb
commit 49d166081b
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
refs/packed-backend.c
View File

@ -274,8 +274,8 @@ struct snapshot_record {
static int cmp_packed_ref_records(const void *v1, const void *v2) static int cmp_packed_ref_records(const void *v1, const void *v2)
{ {
const struct snapshot_record *e1 = v1, *e2 = v2; const struct snapshot_record *e1 = v1, *e2 = v2;
const char *r1 = e1->start + GIT_SHA1_HEXSZ + 1; const char *r1 = e1->start + the_hash_algo->hexsz + 1;
const char *r2 = e2->start + GIT_SHA1_HEXSZ + 1; const char *r2 = e2->start + the_hash_algo->hexsz + 1;
while (1) { while (1) {
if (*r1 == '\n') if (*r1 == '\n')
@ -297,7 +297,7 @@ static int cmp_packed_ref_records(const void *v1, const void *v2)
*/ */
static int cmp_record_to_refname(const char *rec, const char *refname) static int cmp_record_to_refname(const char *rec, const char *refname)
{ {
const char *r1 = rec + GIT_SHA1_HEXSZ + 1; const char *r1 = rec + the_hash_algo->hexsz + 1;
const char *r2 = refname; const char *r2 = refname;
while (1) { while (1) {
@ -344,7 +344,7 @@ static void sort_snapshot(struct snapshot *snapshot)
if (!eol) if (!eol)
/* The safety check should prevent this. */ /* The safety check should prevent this. */
BUG("unterminated line found in packed-refs"); BUG("unterminated line found in packed-refs");
if (eol - pos < GIT_SHA1_HEXSZ + 2) if (eol - pos < the_hash_algo->hexsz + 2)
die_invalid_line(snapshot->refs->path, die_invalid_line(snapshot->refs->path,
pos, eof - pos); pos, eof - pos);
eol++; eol++;
@ -456,7 +456,7 @@ static void verify_buffer_safe(struct snapshot *snapshot)
return; return;
last_line = find_start_of_record(start, eof - 1); last_line = find_start_of_record(start, eof - 1);
if (*(eof - 1) != '\n' || eof - last_line < GIT_SHA1_HEXSZ + 2) if (*(eof - 1) != '\n' || eof - last_line < the_hash_algo->hexsz + 2)
die_invalid_line(snapshot->refs->path, die_invalid_line(snapshot->refs->path,
last_line, eof - last_line); last_line, eof - last_line);
} }
@ -796,7 +796,7 @@ static int next_record(struct packed_ref_iterator *iter)
iter->base.flags = REF_ISPACKED; iter->base.flags = REF_ISPACKED;
if (iter->eof - p < GIT_SHA1_HEXSZ + 2 || if (iter->eof - p < the_hash_algo->hexsz + 2 ||
parse_oid_hex(p, &iter->oid, &p) || parse_oid_hex(p, &iter->oid, &p) ||
!isspace(*p++)) !isspace(*p++))
die_invalid_line(iter->snapshot->refs->path, die_invalid_line(iter->snapshot->refs->path,
@ -826,7 +826,7 @@ static int next_record(struct packed_ref_iterator *iter)
if (iter->pos < iter->eof && *iter->pos == '^') { if (iter->pos < iter->eof && *iter->pos == '^') {
p = iter->pos + 1; p = iter->pos + 1;
if (iter->eof - p < GIT_SHA1_HEXSZ + 1 || if (iter->eof - p < the_hash_algo->hexsz + 1 ||
parse_oid_hex(p, &iter->peeled, &p) || parse_oid_hex(p, &iter->peeled, &p) ||
*p++ != '\n') *p++ != '\n')
die_invalid_line(iter->snapshot->refs->path, die_invalid_line(iter->snapshot->refs->path,