summaryrefslogtreecommitdiff
path: root/pack-objects.h
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2019-02-14 05:50:32 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-02-14 23:26:15 (GMT)
commitc409d108b857799ae699654d2fc33b063c9aef9d (patch)
tree002dfd4a6a6e8fd8a681302010cba425cb49255e /pack-objects.h
parentb53c502807d760ec55db7e7520a360ee35ab7646 (diff)
downloadgit-c409d108b857799ae699654d2fc33b063c9aef9d.zip
git-c409d108b857799ae699654d2fc33b063c9aef9d.tar.gz
git-c409d108b857799ae699654d2fc33b063c9aef9d.tar.bz2
pack-objects: drop unused parameter from oe_map_new_pack()
Since 43fa44fa3b (pack-objects: move in_pack out of struct object_entry, 2018-04-14), we store the source pack for each object as a small index rather than as a pointer. When we see a new pack that has no allocated index, we fall back to generating an array of pointers by calling oe_map_new_pack(). Perhaps counter-intuitively, that function does not need to actually see our new index-less pack. It only allocates and populates the array with the existing packs, after which oe_set_in_pack() actually adds the new pack to the array. Let's drop the unused "struct packed_git" argument to oe_map_new_pack() to avoid confusion. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'pack-objects.h')
-rw-r--r--pack-objects.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/pack-objects.h b/pack-objects.h
index 6bfacc7..6fde7ce 100644
--- a/pack-objects.h
+++ b/pack-objects.h
@@ -247,14 +247,14 @@ static inline struct packed_git *oe_in_pack(const struct packing_data *pack,
return pack->in_pack[e - pack->objects];
}
-void oe_map_new_pack(struct packing_data *pack,
- struct packed_git *p);
+void oe_map_new_pack(struct packing_data *pack);
+
static inline void oe_set_in_pack(struct packing_data *pack,
struct object_entry *e,
struct packed_git *p)
{
if (!p->index)
- oe_map_new_pack(pack, p);
+ oe_map_new_pack(pack);
if (pack->in_pack_by_idx)
e->in_pack_idx = p->index;
else