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 11/14] apply: replace hard-coded constants
Date: Mon, 8 Oct 2018 21:56:58 +0000 [thread overview]
Message-ID: <20181008215701.779099-12-sandals@crustytoothpaste.net> (raw)
In-Reply-To: <20181008215701.779099-1-sandals@crustytoothpaste.net>
Replace several 40-based constants with references to GIT_MAX_HEXSZ or
the_hash_algo, as appropriate.
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
---
apply.c | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
diff --git a/apply.c b/apply.c
index e485fbc6bc..792ecea36a 100644
--- a/apply.c
+++ b/apply.c
@@ -223,8 +223,8 @@ struct patch {
struct fragment *fragments;
char *result;
size_t resultsize;
- char old_sha1_prefix[41];
- char new_sha1_prefix[41];
+ char old_sha1_prefix[GIT_MAX_HEXSZ + 1];
+ char new_sha1_prefix[GIT_MAX_HEXSZ + 1];
struct patch *next;
/* three-way fallback result */
@@ -1093,9 +1093,10 @@ static int gitdiff_index(struct apply_state *state,
*/
const char *ptr, *eol;
int len;
+ const unsigned hexsz = the_hash_algo->hexsz;
ptr = strchr(line, '.');
- if (!ptr || ptr[1] != '.' || 40 < ptr - line)
+ if (!ptr || ptr[1] != '.' || hexsz < ptr - line)
return 0;
len = ptr - line;
memcpy(patch->old_sha1_prefix, line, len);
@@ -1109,7 +1110,7 @@ static int gitdiff_index(struct apply_state *state,
ptr = eol;
len = ptr - line;
- if (40 < len)
+ if (hexsz < len)
return 0;
memcpy(patch->new_sha1_prefix, line, len);
patch->new_sha1_prefix[len] = 0;
@@ -3142,13 +3143,14 @@ static int apply_binary(struct apply_state *state,
{
const char *name = patch->old_name ? patch->old_name : patch->new_name;
struct object_id oid;
+ const unsigned hexsz = the_hash_algo->hexsz;
/*
* For safety, we require patch index line to contain
- * full 40-byte textual SHA1 for old and new, at least for now.
+ * full hex textual object ID for old and new, at least for now.
*/
- if (strlen(patch->old_sha1_prefix) != 40 ||
- strlen(patch->new_sha1_prefix) != 40 ||
+ if (strlen(patch->old_sha1_prefix) != hexsz ||
+ strlen(patch->new_sha1_prefix) != hexsz ||
get_oid_hex(patch->old_sha1_prefix, &oid) ||
get_oid_hex(patch->new_sha1_prefix, &oid))
return error(_("cannot apply binary patch to '%s' "
@@ -4055,7 +4057,7 @@ static int preimage_oid_in_gitlink_patch(struct patch *p, struct object_id *oid)
starts_with(++preimage, heading) &&
/* does it record full SHA-1? */
!get_oid_hex(preimage + sizeof(heading) - 1, oid) &&
- preimage[sizeof(heading) + GIT_SHA1_HEXSZ - 1] == '\n' &&
+ preimage[sizeof(heading) + the_hash_algo->hexsz - 1] == '\n' &&
/* does the abbreviated name on the index line agree with it? */
starts_with(preimage + sizeof(heading) - 1, p->old_sha1_prefix))
return 0; /* it all looks fine */
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 ` [PATCH 08/14] upload-pack: express constants in terms of the_hash_algo brian m. carlson
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 ` brian m. carlson [this message]
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181008215701.779099-12-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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.