diff mbox series

[v2,31/35] builtin/difftool: use parse_oid_hex

Message ID	20190219000526.476553-32-sandals@crustytoothpaste.net (mailing list archive)
State	New, archived
Headers	show Return-Path: <git-owner@kernel.org> From: "brian m. carlson" <sandals@crustytoothpaste.net> To: <git@vger.kernel.org> Cc: Eric Sunshine <sunshine@sunshineco.com>, =?utf-8?b?w4Z2YXIgQXJuZmrDtnI=?= =?utf-8?b?w7AgQmphcm1hc29u?= <avarab@gmail.com>, =?utf-8?q?Ren=C3=A9_Schar?= =?utf-8?q?fe?= <l.s.r@web.de>, Jeff King <peff@peff.net> Subject: [PATCH v2 31/35] builtin/difftool: use parse_oid_hex Date: Tue, 19 Feb 2019 00:05:22 +0000 Message-Id: <20190219000526.476553-32-sandals@crustytoothpaste.net> In-Reply-To: <20190219000526.476553-1-sandals@crustytoothpaste.net> References: <20190219000526.476553-1-sandals@crustytoothpaste.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: git-owner@vger.kernel.org Precedence: bulk
Series	Hash function transition part 16 \| expand [v2,00/35] Hash function transition part 16 [v2,01/35] t/lib-submodule-update: use appropriate length constant [v2,02/35] khash: move oid hash table definition [v2,03/35] pack-bitmap: make bitmap header handling hash agnostic [v2,04/35] pack-bitmap: convert struct stored_bitmap to object_id [v2,05/35] pack-bitmap: replace sha1_to_hex [v2,06/35] pack-bitmap: switch hard-coded constants to the_hash_algo [v2,07/35] pack-bitmap: switch hash tables to use struct object_id [v2,08/35] submodule: avoid hard-coded constants [v2,09/35] notes-merge: switch to use the_hash_algo [v2,10/35] notes: make hash size independent [v2,11/35] notes: replace sha1_to_hex [v2,12/35] object-store: rename and expand packed_git's sha1 member [v2,13/35] builtin/name-rev: make hash-size independent [v2,14/35] fast-import: make hash-size independent [v2,15/35] fast-import: replace sha1_to_hex [v2,16/35] builtin/am: make hash size independent [v2,17/35] builtin/pull: make hash-size independent [v2,18/35] http-push: convert to use the_hash_algo [v2,19/35] http-backend: allow 64-character hex names [v2,20/35] http-push: remove remaining uses of sha1_to_hex [v2,21/35] http-walker: replace sha1_to_hex [v2,22/35] http: replace hard-coded constant with the_hash_algo [v2,23/35] http: compute hash of downloaded objects using the_hash_algo [v2,24/35] http: replace sha1_to_hex [v2,25/35] remote-curl: make hash size independent [v2,26/35] hash: add a function to lookup hash algorithm by length [v2,27/35] get-tar-commit-id: parse comment record [v2,28/35] builtin/get-tar-commit-id: make hash size independent [v2,29/35] archive: convert struct archiver_args to object_id [v2,30/35] refspec: make hash size independent [v2,31/35] builtin/difftool: use parse_oid_hex [v2,32/35] dir: make untracked cache extension hash size independent [v2,33/35] read-cache: read data in a hash-independent way [v2,34/35] Git.pm: make hash size independent [v2,35/35] gitweb: make hash size independent

Commit Message

brian m. carlson Feb. 19, 2019, 12:05 a.m. UTC

Instead of using get_oid_hex and adding constants to the result, use
parse_oid_hex to make this code independent of the hash size.

Additionally, correct a typo that would cause us to print one too few
characters on error, since we will already have incremented the pointer
to point to the beginning of the object ID before we get to printing the
error message.

Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
---
 builtin/difftool.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff mbox series

Patch

diff --git a/builtin/difftool.c b/builtin/difftool.c
index a3ea60ea71..5fa83f481e 100644
--- a/builtin/difftool.c
+++ b/builtin/difftool.c
@@ -65,14 +65,12 @@  static int parse_index_info(char *p, int *mode1, int *mode2,
 	*mode2 = (int)strtol(p + 1, &p, 8);
 	if (*p != ' ')
 		return error("expected ' ', got '%c'", *p);
-	if (get_oid_hex(++p, oid1))
-		return error("expected object ID, got '%s'", p + 1);
-	p += GIT_SHA1_HEXSZ;
+	if (parse_oid_hex(++p, oid1, (const char **)&p))
+		return error("expected object ID, got '%s'", p);
 	if (*p != ' ')
 		return error("expected ' ', got '%c'", *p);
-	if (get_oid_hex(++p, oid2))
-		return error("expected object ID, got '%s'", p + 1);
-	p += GIT_SHA1_HEXSZ;
+	if (parse_oid_hex(++p, oid2, (const char **)&p))
+		return error("expected object ID, got '%s'", p);
 	if (*p != ' ')
 		return error("expected ' ', got '%c'", *p);
 	*status = *++p;