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>,
"Stefan Beller" <sbeller@google.com>
Subject: [PATCH v2 12/15] apply: replace hard-coded constants
Date: Mon, 15 Oct 2018 00:01:59 +0000 [thread overview]
Message-ID: <20181015000202.951965-13-sandals@crustytoothpaste.net> (raw)
In-Reply-To: <20181015000202.951965-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-15 0:02 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-15 0:01 [PATCH v2 00/15] Hash function transition part 15 brian m. carlson
2018-10-15 0:01 ` [PATCH v2 01/15] object_id.cocci: match only expressions of type 'struct object_id' brian m. carlson
2018-10-15 0:01 ` [PATCH v2 02/15] pack-bitmap-write: use GIT_MAX_RAWSZ for allocation brian m. carlson
2018-10-15 0:01 ` [PATCH v2 03/15] builtin/repack: replace hard-coded constants brian m. carlson
2018-10-15 0:01 ` [PATCH v2 04/15] builtin/mktree: remove hard-coded constant brian m. carlson
2018-10-15 0:01 ` [PATCH v2 05/15] builtin/fetch-pack: remove constants with parse_oid_hex brian m. carlson
2018-10-15 0:01 ` [PATCH v2 06/15] pack-revindex: express constants in terms of the_hash_algo brian m. carlson
2018-10-15 0:01 ` [PATCH v2 07/15] packfile: " brian m. carlson
2018-10-15 0:01 ` [PATCH v2 08/15] refs/packed-backend: express constants using the_hash_algo brian m. carlson
2018-10-15 0:01 ` [PATCH v2 09/15] upload-pack: express constants in terms of the_hash_algo brian m. carlson
2018-10-15 0:01 ` [PATCH v2 10/15] transport: use parse_oid_hex instead of a constant brian m. carlson
2018-10-15 0:01 ` [PATCH v2 11/15] tag: express constant in terms of the_hash_algo brian m. carlson
2018-10-15 0:01 ` brian m. carlson [this message]
2018-10-15 0:02 ` [PATCH v2 13/15] apply: rename new_sha1_prefix and old_sha1_prefix brian m. carlson
2018-10-15 0:02 ` [PATCH v2 14/15] submodule: make zero-oid comparison hash function agnostic brian m. carlson
2018-10-15 0:02 ` [PATCH v2 15/15] rerere: convert to use the_hash_algo brian m. carlson
2018-10-25 8:11 ` [PATCH v2 00/15] Hash function transition part 15 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=20181015000202.951965-13-sandals@crustytoothpaste.net \
--to=sandals@crustytoothpaste.net \
--cc=git@vger.kernel.org \
--cc=pclouds@gmail.com \
--cc=peff@peff.net \
--cc=sbeller@google.com \
--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).