From: "brian m. carlson" <sandals@crustytoothpaste.net>
To: git@vger.kernel.org
Cc: "Jeff King" <peff@peff.net>,
"Eric Sunshine" <sunshine@sunshineco.com>,
"Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
Subject: [PATCH 08/14] upload-pack: express constants in terms of the_hash_algo
Date: Mon, 8 Oct 2018 21:56:55 +0000 [thread overview]
Message-ID: <20181008215701.779099-9-sandals@crustytoothpaste.net> (raw)
In-Reply-To: <20181008215701.779099-1-sandals@crustytoothpaste.net>
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>
---
upload-pack.c | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/upload-pack.c b/upload-pack.c
index 62a1000f44..1aae5dd828 100644
--- a/upload-pack.c
+++ b/upload-pack.c
@@ -443,6 +443,7 @@ static int do_reachable_revlist(struct child_process *cmd,
struct object *o;
char namebuf[GIT_MAX_HEXSZ + 2]; /* ^ + hash + LF */
int i;
+ const unsigned hexsz = the_hash_algo->hexsz;
cmd->argv = argv;
cmd->git_cmd = 1;
@@ -461,7 +462,7 @@ static int do_reachable_revlist(struct child_process *cmd,
goto error;
namebuf[0] = '^';
- namebuf[GIT_SHA1_HEXSZ + 1] = '\n';
+ namebuf[hexsz + 1] = '\n';
for (i = get_max_object_index(); 0 < i; ) {
o = get_indexed_object(--i);
if (!o)
@@ -470,11 +471,11 @@ static int do_reachable_revlist(struct child_process *cmd,
o->flags &= ~TMP_MARK;
if (!is_our_ref(o))
continue;
- memcpy(namebuf + 1, oid_to_hex(&o->oid), GIT_SHA1_HEXSZ);
- if (write_in_full(cmd->in, namebuf, GIT_SHA1_HEXSZ + 2) < 0)
+ memcpy(namebuf + 1, oid_to_hex(&o->oid), hexsz);
+ if (write_in_full(cmd->in, namebuf, hexsz + 2) < 0)
goto error;
}
- namebuf[GIT_SHA1_HEXSZ] = '\n';
+ namebuf[hexsz] = '\n';
for (i = 0; i < src->nr; i++) {
o = src->objects[i].item;
if (is_our_ref(o)) {
@@ -484,8 +485,8 @@ static int do_reachable_revlist(struct child_process *cmd,
}
if (reachable && o->type == OBJ_COMMIT)
o->flags |= TMP_MARK;
- memcpy(namebuf, oid_to_hex(&o->oid), GIT_SHA1_HEXSZ);
- if (write_in_full(cmd->in, namebuf, GIT_SHA1_HEXSZ + 1) < 0)
+ memcpy(namebuf, oid_to_hex(&o->oid), hexsz);
+ if (write_in_full(cmd->in, namebuf, hexsz + 1) < 0)
goto error;
}
close(cmd->in);
next prev parent reply other threads:[~2018-10-08 21:57 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-08 21:56 [PATCH 00/14] Hash function transition part 15 brian m. carlson
2018-10-08 21:56 ` [PATCH 01/14] pack-bitmap-write: use GIT_MAX_RAWSZ for allocation brian m. carlson
2018-10-08 21:56 ` [PATCH 02/14] builtin/repack: replace hard-coded constant brian m. carlson
2018-10-08 22:27 ` Stefan Beller
2018-10-08 23:01 ` Eric Sunshine
2018-10-09 23:00 ` brian m. carlson
2018-10-08 21:56 ` [PATCH 03/14] builtin/mktree: remove " brian m. carlson
2018-10-08 22:32 ` Stefan Beller
2018-10-08 21:56 ` [PATCH 04/14] builtin/fetch-pack: remove constants with parse_oid_hex brian m. carlson
2018-10-08 21:56 ` [PATCH 05/14] pack-revindex: express constants in terms of the_hash_algo brian m. carlson
2018-10-08 22:44 ` Stefan Beller
2018-10-09 22:26 ` brian m. carlson
2018-10-08 21:56 ` [PATCH 06/14] packfile: " brian m. carlson
2018-10-08 22:59 ` Stefan Beller
2018-10-09 22:25 ` brian m. carlson
2018-10-09 22:34 ` Stefan Beller
2018-10-09 22:54 ` brian m. carlson
2018-10-08 21:56 ` [PATCH 07/14] refs/packed-backend: express constants using the_hash_algo brian m. carlson
2018-10-08 21:56 ` brian m. carlson [this message]
2018-10-08 21:56 ` [PATCH 09/14] transport: use parse_oid_hex instead of a constant brian m. carlson
2018-10-08 21:56 ` [PATCH 10/14] tag: express constant in terms of the_hash_algo brian m. carlson
2018-10-08 21:56 ` [PATCH 11/14] apply: replace hard-coded constants brian m. carlson
2018-10-08 21:56 ` [PATCH 12/14] apply: rename new_sha1_prefix and old_sha1_prefix brian m. carlson
2018-10-08 21:57 ` [PATCH 13/14] submodule: make zero-oid comparison hash function agnostic brian m. carlson
2018-10-08 23:10 ` Stefan Beller
2018-10-08 21:57 ` [PATCH 14/14] rerere: convert to use the_hash_algo brian m. carlson
2018-10-08 23:18 ` Stefan Beller
2018-10-12 13:11 ` [PATCH] object_id.cocci: match only expressions of type 'struct object_id' SZEDER Gábor
2018-10-15 2:34 ` Junio C Hamano
2018-10-15 4:24 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181008215701.779099-9-sandals@crustytoothpaste.net \
--to=sandals@crustytoothpaste.net \
--cc=git@vger.kernel.org \
--cc=pclouds@gmail.com \
--cc=peff@peff.net \
--cc=sunshine@sunshineco.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).