From: brian m. carlson Date: Mon, 12 Mar 2018 02:27:43 GMT Subject: [PATCH v3 23/36] sha1_file: convert retry_bad_packed_offset to struct object_id Message-ID: <20180312022756.483934-24-sandals@crustytoothpaste.net> In-Reply-To: <20180312022756.483934-1-sandals@crustytoothpaste.net> Signed-off-by: brian m. carlson --- packfile.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packfile.c b/packfile.c index 7c1a2519fc..5f08aa0a14 100644 --- a/packfile.c +++ b/packfile.c @@ -1095,13 +1095,13 @@ static int retry_bad_packed_offset(struct packed_git *p, off_t obj_offset) { int type; struct revindex_entry *revidx; - const unsigned char *sha1; + struct object_id oid; revidx = find_pack_revindex(p, obj_offset); if (!revidx) return OBJ_BAD; - sha1 = nth_packed_object_sha1(p, revidx->nr); - mark_bad_packed_object(p, sha1); - type = sha1_object_info(sha1, NULL); + nth_packed_object_oid(&oid, p, revidx->nr); + mark_bad_packed_object(p, oid.hash); + type = sha1_object_info(oid.hash, NULL); if (type <= OBJ_NONE) return OBJ_BAD; return type;