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

upload-pack: replace use of several hard-coded constants

Browse Source 
Update several uses of hard-coded 40-based constants to use either
the_hash_algo or GIT_MAX_HEXSZ, as appropriate.  Replace a combined use
of oid_to_hex and memcpy with oid_to_hex_r, which not only avoids the
need for a constant, but is more efficient.  Make use of parse_oid_hex
to eliminate the need for constants and simplify the code at the same
time.  Update some comments to no longer refer to SHA-1 as well.

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-05-02 00:25:51 +00:00 committed by Junio C Hamano
parent fd521245e6
commit 55dc227d16
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
upload-pack.c
View File

@ -450,7 +450,7 @@ static int get_common_commits(void)
break; break;
default: default:
got_common = 1; got_common = 1;
memcpy(last_hex, oid_to_hex(&oid), 41); oid_to_hex_r(last_hex, &oid);
if (multi_ack == 2) if (multi_ack == 2)
packet_write_fmt(1, "ACK %s common\n", last_hex); packet_write_fmt(1, "ACK %s common\n", last_hex);
else if (multi_ack) else if (multi_ack)
@ -492,7 +492,7 @@ static int do_reachable_revlist(struct child_process *cmd,
"rev-list", "--stdin", NULL, "rev-list", "--stdin", NULL,
}; };
struct object *o; struct object *o;
char namebuf[42]; /* ^ + SHA-1 + LF */ char namebuf[GIT_MAX_HEXSZ + 2]; /* ^ + hash + LF */
int i; int i;
cmd->argv = argv; cmd->argv = argv;
@ -561,15 +561,17 @@ static int get_reachable_list(struct object_array *src,
struct child_process cmd = CHILD_PROCESS_INIT; struct child_process cmd = CHILD_PROCESS_INIT;
int i; int i;
struct object *o; struct object *o;
char namebuf[42]; /* ^ + SHA-1 + LF */ char namebuf[GIT_MAX_HEXSZ + 2]; /* ^ + hash + LF */
const unsigned hexsz = the_hash_algo->hexsz;
if (do_reachable_revlist(&cmd, src, reachable) < 0) if (do_reachable_revlist(&cmd, src, reachable) < 0)
return -1; return -1;
while ((i = read_in_full(cmd.out, namebuf, 41)) == 41) { while ((i = read_in_full(cmd.out, namebuf, hexsz + 1)) == hexsz + 1) {
struct object_id sha1; struct object_id sha1;
const char *p;
if (namebuf[40] != '\n' || get_oid_hex(namebuf, &sha1)) if (parse_oid_hex(namebuf, &sha1, &p) || *p != '\n')
break; break;
o = lookup_object(sha1.hash); o = lookup_object(sha1.hash);
@ -820,11 +822,9 @@ static void receive_needs(void)
continue; continue;
} }
if (!skip_prefix(line, "want ", &arg) || if (!skip_prefix(line, "want ", &arg) ||
get_oid_hex(arg, &oid_buf)) parse_oid_hex(arg, &oid_buf, &features))
die("git upload-pack: protocol error, " die("git upload-pack: protocol error, "
"expected to get sha, not '%s'", line); "expected to get object ID, not '%s'", line);
features = arg + 40;
if (parse_feature_request(features, "deepen-relative")) if (parse_feature_request(features, "deepen-relative"))
deepen_relative = 1; deepen_relative = 1;