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 10/15] transport: use parse_oid_hex instead of a constant
Date: Mon, 15 Oct 2018 00:01:57 +0000 [thread overview]
Message-ID: <20181015000202.951965-11-sandals@crustytoothpaste.net> (raw)
In-Reply-To: <20181015000202.951965-1-sandals@crustytoothpaste.net>
Use parse_oid_hex to compute a pointer instead of using GIT_SHA1_HEXSZ.
This simplifies the code and makes it independent of the hash length.
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
---
transport.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/transport.c b/transport.c
index 1c76d64aba..44b9ddf670 100644
--- a/transport.c
+++ b/transport.c
@@ -1346,15 +1346,16 @@ static void read_alternate_refs(const char *path,
fh = xfdopen(cmd.out, "r");
while (strbuf_getline_lf(&line, fh) != EOF) {
struct object_id oid;
+ const char *p;
- if (get_oid_hex(line.buf, &oid) ||
- line.buf[GIT_SHA1_HEXSZ] != ' ') {
+ if (parse_oid_hex(line.buf, &oid, &p) ||
+ *p != ' ') {
warning(_("invalid line while parsing alternate refs: %s"),
line.buf);
break;
}
- cb(line.buf + GIT_SHA1_HEXSZ + 1, &oid, data);
+ cb(p + 1, &oid, data);
}
fclose(fh);
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 ` brian m. carlson [this message]
2018-10-15 0:01 ` [PATCH v2 11/15] tag: express constant " brian m. carlson
2018-10-15 0:01 ` [PATCH v2 12/15] apply: replace hard-coded constants brian m. carlson
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-11-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).