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

upload-pack: express constants in terms of the_hash_algo

Browse Source 
Convert all uses of the GIT_SHA1_HEXSZ to use the_hash_algo so that they
are appropriate for 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:56 +00:00 committed by Junio C Hamano
parent 49d166081b
commit f690b6b030
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
upload-pack.c
View File

@ -443,6 +443,7 @@ static int do_reachable_revlist(struct child_process *cmd,
struct object *o; struct object *o;
char namebuf[GIT_MAX_HEXSZ + 2]; /* ^ + hash + LF */ char namebuf[GIT_MAX_HEXSZ + 2]; /* ^ + hash + LF */
int i; int i;
const unsigned hexsz = the_hash_algo->hexsz;
cmd->argv = argv; cmd->argv = argv;
cmd->git_cmd = 1; cmd->git_cmd = 1;
@ -461,7 +462,7 @@ static int do_reachable_revlist(struct child_process *cmd,
goto error; goto error;
namebuf[0] = '^'; namebuf[0] = '^';
namebuf[GIT_SHA1_HEXSZ + 1] = '\n'; namebuf[hexsz + 1] = '\n';
for (i = get_max_object_index(); 0 < i; ) { for (i = get_max_object_index(); 0 < i; ) {
o = get_indexed_object(--i); o = get_indexed_object(--i);
if (!o) if (!o)
@ -470,11 +471,11 @@ static int do_reachable_revlist(struct child_process *cmd,
o->flags &= ~TMP_MARK; o->flags &= ~TMP_MARK;
if (!is_our_ref(o)) if (!is_our_ref(o))
continue; continue;
memcpy(namebuf + 1, oid_to_hex(&o->oid), GIT_SHA1_HEXSZ); memcpy(namebuf + 1, oid_to_hex(&o->oid), hexsz);
if (write_in_full(cmd->in, namebuf, GIT_SHA1_HEXSZ + 2) < 0) if (write_in_full(cmd->in, namebuf, hexsz + 2) < 0)
goto error; goto error;
} }
namebuf[GIT_SHA1_HEXSZ] = '\n'; namebuf[hexsz] = '\n';
for (i = 0; i < src->nr; i++) { for (i = 0; i < src->nr; i++) {
o = src->objects[i].item; o = src->objects[i].item;
if (is_our_ref(o)) { if (is_our_ref(o)) {
@ -484,8 +485,8 @@ static int do_reachable_revlist(struct child_process *cmd,
} }
if (reachable && o->type == OBJ_COMMIT) if (reachable && o->type == OBJ_COMMIT)
o->flags |= TMP_MARK; o->flags |= TMP_MARK;
memcpy(namebuf, oid_to_hex(&o->oid), GIT_SHA1_HEXSZ); memcpy(namebuf, oid_to_hex(&o->oid), hexsz);
if (write_in_full(cmd->in, namebuf, GIT_SHA1_HEXSZ + 1) < 0) if (write_in_full(cmd->in, namebuf, hexsz + 1) < 0)
goto error; goto error;
} }
close(cmd->in); close(cmd->in);