check_object(): convert to new revindex API

Replace direct accesses to the revindex with calls to
'offset_to_pack_pos()' and 'pack_pos_to_index()'.

Since this caller already had some error checking (it can jump to the
'give_up' label if it encounters an error), we can easily check whether
or not the provided offset points to an object in the given pack. This
error checking existed prior to this patch, too, since the caller checks
whether the return value from 'find_pack_revindex()' was NULL or not.

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

diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
index 77ce558..5b0c448 100644 (file)
--- a/builtin/pack-objects.c
+++ b/builtin/pack-objects.c
@@ -1817,11 +1817,11 @@ static void check_object(struct object_entry *entry, uint32_t object_index)
                                goto give_up;
                        }
                        if (reuse_delta && !entry->preferred_base) {
-                               struct revindex_entry *revidx;
-                               revidx = find_pack_revindex(p, ofs);
-                               if (!revidx)
+                               uint32_t pos;
+                               if (offset_to_pack_pos(p, ofs, &pos) < 0)
                                        goto give_up;
-                               if (!nth_packed_object_id(&base_ref, p, revidx->nr))
+                               if (!nth_packed_object_id(&base_ref, p,
+                                                         pack_pos_to_index(p, pos)))
                                        have_base = 1;
                        }
                        entry->in_pack_header_size = used + used_0;