pack-objects: use object_id in packlist_alloc()

peff · gitster · commit f1cbd033e201 · 2019-09-06T11:03:39.000-07:00
The only caller of packlist_alloc() already has a "struct object_id",
and we immediately copy the hash they pass us into our own object_id.
Let's avoid the unnecessary round-trip to a raw sha1 pointer.

Signed-off-by: Jeff King &lt;peff@peff.net&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
@@ -1147,7 +1147,7 @@ static void create_object_entry(const struct object_id *oid,
 {
 	struct object_entry *entry;
 
-	entry = packlist_alloc(&to_pack, oid->hash, index_pos);
+	entry = packlist_alloc(&to_pack, oid, index_pos);
 	entry->hash = hash;
 	oe_set_type(entry, type);
 	if (exclude)
diff --git a/pack-objects.c b/pack-objects.c
@@ -153,7 +153,7 @@ void prepare_packing_data(struct repository *r, struct packing_data *pdata)
 }
 
 struct object_entry *packlist_alloc(struct packing_data *pdata,
-				    const unsigned char *sha1,
+				    const struct object_id *oid,
 				    uint32_t index_pos)
 {
 	struct object_entry *new_entry;
@@ -177,7 +177,7 @@ struct object_entry *packlist_alloc(struct packing_data *pdata,
 	new_entry = pdata->objects + pdata->nr_objects++;
 
 	memset(new_entry, 0, sizeof(*new_entry));
-	hashcpy(new_entry->idx.oid.hash, sha1);
+	oidcpy(&new_entry->idx.oid, oid);
 
 	if (pdata->index_size * 3 <= pdata->nr_objects * 4)
 		rehash_objects(pdata);
diff --git a/pack-objects.h b/pack-objects.h
@@ -183,7 +183,7 @@ static inline void packing_data_unlock(struct packing_data *pdata)
 }
 
 struct object_entry *packlist_alloc(struct packing_data *pdata,
-				    const unsigned char *sha1,
+				    const struct object_id *oid,
 				    uint32_t index_pos);
 
 struct object_entry *packlist_find(struct packing_data *pdata,

Original file line number	Diff line number	Diff line change
`@@ -1147,7 +1147,7 @@ static void create_object_entry(const struct object_id *oid,`
`1147`	`1147`	`{`
`1148`	`1148`	`struct object_entry *entry;`
`1149`	`1149`
`1150`		`- entry = packlist_alloc(&to_pack, oid->hash, index_pos);`
	`1150`	`+ entry = packlist_alloc(&to_pack, oid, index_pos);`
`1151`	`1151`	`entry->hash = hash;`
`1152`	`1152`	`oe_set_type(entry, type);`
`1153`	`1153`	`if (exclude)`
Original file line number	Diff line number	Diff line change
`@@ -153,7 +153,7 @@ void prepare_packing_data(struct repository r, struct packing_data pdata)`
`153`	`153`	`}`
`154`	`154`
`155`	`155`	`struct object_entry packlist_alloc(struct packing_data pdata,`
`156`		`- const unsigned char *sha1,`
	`156`	`+ const struct object_id *oid,`
`157`	`157`	`uint32_t index_pos)`
`158`	`158`	`{`
`159`	`159`	`struct object_entry *new_entry;`
`@@ -177,7 +177,7 @@ struct object_entry packlist_alloc(struct packing_data pdata,`
`177`	`177`	`new_entry = pdata->objects + pdata->nr_objects++;`
`178`	`178`
`179`	`179`	`memset(new_entry, 0, sizeof(*new_entry));`
`180`		`- hashcpy(new_entry->idx.oid.hash, sha1);`
	`180`	`+ oidcpy(&new_entry->idx.oid, oid);`
`181`	`181`
`182`	`182`	`if (pdata->index_size * 3 <= pdata->nr_objects * 4)`
`183`	`183`	`rehash_objects(pdata);`
Original file line number	Diff line number	Diff line change
`@@ -183,7 +183,7 @@ static inline void packing_data_unlock(struct packing_data *pdata)`
`183`	`183`	`}`
`184`	`184`
`185`	`185`	`struct object_entry packlist_alloc(struct packing_data pdata,`
`186`		`- const unsigned char *sha1,`
	`186`	`+ const struct object_id *oid,`
`187`	`187`	`uint32_t index_pos);`
`188`	`188`
`189`	`189`	`struct object_entry packlist_find(struct packing_data pdata,`