[09/14] upload-pack: pass upload_pack_data to process_haves()

Commit Message

Christian Couder June 11, 2020, 12:05 p.m. UTC

As we cleanup 'upload-pack.c' by using 'struct upload_pack_data'
more thoroughly, let's pass that struct to process_haves(), so
that this function can use all the fields of the struct.

This will be used in followup commits to move a static variable
into 'upload_pack_data'.

Signed-off-by: Christian Couder <[e-mail]>
---
 upload-pack.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

Patch

diff --git a/upload-pack.c b/upload-pack.c
index 0b30794d91..b20600fceb 100644
--- a/upload-pack.c
+++ b/upload-pack.c
@@ -1348,14 +1348,13 @@  static void process_args(struct packet_reader *request,
 		die(_("expected flush after fetch arguments"));
 }
 
-static int process_haves(struct oid_array *haves, struct oid_array *common,
-			 struct object_array *have_obj)
+static int process_haves(struct upload_pack_data *data, struct oid_array *common)
 {
 	int i;
 
 	/* Process haves */
-	for (i = 0; i < haves->nr; i++) {
-		const struct object_id *oid = &haves->oid[i];
+	for (i = 0; i < data->haves.nr; i++) {
+		const struct object_id *oid = &data->haves.oid[i];
 		struct object *o;
 		int we_knew_they_have = 0;
 
@@ -1382,7 +1381,7 @@  static int process_haves(struct oid_array *haves, struct oid_array *common,
 				parents->item->object.flags |= THEY_HAVE;
 		}
 		if (!we_knew_they_have)
-			add_object_array(o, NULL, have_obj);
+			add_object_array(o, NULL, &data->have_obj);
 	}
 
 	return 0;
@@ -1419,7 +1418,7 @@  static int process_haves_and_send_acks(struct upload_pack_data *data)
 	struct oid_array common = OID_ARRAY_INIT;
 	int ret = 0;
 
-	process_haves(&data->haves, &common, &data->have_obj);
+	process_haves(data, &common);
 	if (data->done) {
 		ret = 1;
 	} else if (send_acks(&data->writer, &common,