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>
Jeff King committed
Feb 14, 2019 at 00:50 UTC
c409d108b857799ae699654d2fc33b063c9aef9d
2 files changed
+4
-5
pack-objects.c
+1
-2
@@ -119,8 +119,7 @@ static void prepare_in_pack_by_idx(struct packing_data *pdata)
119
* this fall back code, just stay simple and fall back to using
120
* in_pack[] array.
121
*/
122
-void oe_map_new_pack(struct packing_data *pack,
123
- struct packed_git *p)
122
+void oe_map_new_pack(struct packing_data *pack)
123
{
124
uint32_t i;
125
pack-objects.h
+3
-3
@@ -247,14 +247,14 @@ static inline struct packed_git *oe_in_pack(const struct packing_data *pack,
247
return pack->in_pack[e - pack->objects];
248
}
249
250
-void oe_map_new_pack(struct packing_data *pack,
251
- struct packed_git *p);
250
+void oe_map_new_pack(struct packing_data *pack);
251
+
252
static inline void oe_set_in_pack(struct packing_data *pack,
253
struct object_entry *e,
254
struct packed_git *p)
255
{
256
if (!p->index)
257
- oe_map_new_pack(pack, p);
257
+ oe_map_new_pack(pack);
258
if (pack->in_pack_by_idx)
259
e->in_pack_idx = p->index;
260
else