pack-objects: drop unused parameter from oe_map_new_pack()

peff · gitster · commit c409d108b857 · 2019-02-14T15:26:15.000-08:00
Since 43fa44f (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>
diff --git a/pack-objects.c b/pack-objects.c
@@ -119,8 +119,7 @@ static void prepare_in_pack_by_idx(struct packing_data *pdata)
  * this fall back code, just stay simple and fall back to using
  * in_pack[] array.
  */
-void oe_map_new_pack(struct packing_data *pack,
-		     struct packed_git *p)
+void oe_map_new_pack(struct packing_data *pack)
 {
 	uint32_t i;
 
diff --git 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

Original file line number	Diff line number	Diff line change
`@@ -119,8 +119,7 @@ static void prepare_in_pack_by_idx(struct packing_data *pdata)`
`119`	`119`	`* this fall back code, just stay simple and fall back to using`
`120`	`120`	`* in_pack[] array.`
`121`	`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)`
`124`	`123`	`{`
`125`	`124`	`uint32_t i;`
`126`	`125`