retry_bad_packed_offset(): convert to new revindex API

Perform exactly the same conversion as in the previous commit to another
caller within 'packfile.c'.

Signed-off-by: Taylor Blau <me@ttaylorr.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/packfile.c b/packfile.c
index 3e3f391949a1ef66b95fdafdea50d4f607aa1b27..7c37f9ec5cbbe3f258e09cf6484251854ac58d6e 100644 (file)
--- a/packfile.c
+++ b/packfile.c
@@ -1256,12 +1256,11 @@ static int retry_bad_packed_offset(struct repository *r,
                                   off_t obj_offset)
 {
        int type;
-       struct revindex_entry *revidx;
+       uint32_t pos;
        struct object_id oid;
-       revidx = find_pack_revindex(p, obj_offset);
-       if (!revidx)
+       if (offset_to_pack_pos(p, obj_offset, &pos) < 0)
                return OBJ_BAD;
-       nth_packed_object_id(&oid, p, revidx->nr);
+       nth_packed_object_id(&oid, p, pack_pos_to_index(p, pos));
        mark_bad_packed_object(p, oid.hash);
        type = oid_object_info(r, &oid, NULL);
        if (type <= OBJ_NONE)