diff options
| author | Jeff King <peff@peff.net> | 2024-10-25 03:06:06 -0400 |
|---|---|---|
| committer | Taylor Blau <me@ttaylorr.com> | 2024-10-25 17:35:46 -0400 |
| commit | 479ab76c9ffbd35585a1506ac5c99fe218df70b9 (patch) | |
| tree | 9e3218c9573b0b45ca5e90e4e5660cfa18592b6c /midx.c | |
| parent | packfile: convert find_sha1_pack() to use object_id (diff) | |
| download | git-479ab76c9ffbd35585a1506ac5c99fe218df70b9.tar.gz git-479ab76c9ffbd35585a1506ac5c99fe218df70b9.zip | |
packfile: use object_id in find_pack_entry_one()
The main function we use to search a pack index for an object is
find_pack_entry_one(). That function still takes a bare pointer to the
hash, despite the fact that its underlying bsearch_pack() function needs
an object_id struct. And so we end up making an extra copy of the hash
into the struct just to do a lookup.
As it turns out, all callers but one already have such an object_id. So
we can just take a pointer to that struct and use it directly. This
avoids the extra copy and provides a more type-safe interface.
The one exception is get_delta_base() in packfile.c, when we are chasing
a REF_DELTA from inside the pack (and thus we have a pointer directly to
the mmap'd pack memory, not a struct). We can just bump the hashcpy()
from inside find_pack_entry_one() to this one caller that needs it.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Taylor Blau <me@ttaylorr.com>
Diffstat (limited to 'midx.c')
| -rw-r--r-- | midx.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -987,7 +987,7 @@ int verify_midx_file(struct repository *r, const char *object_dir, unsigned flag } m_offset = e.offset; - p_offset = find_pack_entry_one(oid.hash, e.p); + p_offset = find_pack_entry_one(&oid, e.p); if (m_offset != p_offset) midx_report(_("incorrect object offset for oid[%d] = %s: %"PRIx64" != %"PRIx64), |
