upload-pack: pass upload_pack_data to process_haves()
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 <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Christian Couder committed
Jun 11, 2020 at 14:05 UTC
8dcf22785f33ad65f6ceefa33480dfa09749590a
1 file changed
+5
-6
upload-pack.c
+5
-6
@@ -1348,14 +1348,13 @@ static void process_args(struct packet_reader *request,
1348
die(_("expected flush after fetch arguments"));
1349
}
1350
1351
-static int process_haves(struct oid_array *haves, struct oid_array *common,
1352
- struct object_array *have_obj)
1351
+static int process_haves(struct upload_pack_data *data, struct oid_array *common)
1352
{
1353
int i;
1354
1355
/* Process haves */
1357
- for (i = 0; i < haves->nr; i++) {
1358
- const struct object_id *oid = &haves->oid[i];
1356
+ for (i = 0; i < data->haves.nr; i++) {
1357
+ const struct object_id *oid = &data->haves.oid[i];
1358
struct object *o;
1359
int we_knew_they_have = 0;
1360
@@ -1382,7 +1381,7 @@ static int process_haves(struct oid_array *haves, struct oid_array *common,
1381
parents->item->object.flags |= THEY_HAVE;
1382
}
1383
if (!we_knew_they_have)
1385
- add_object_array(o, NULL, have_obj);
1384
+ add_object_array(o, NULL, &data->have_obj);
1385
}
1386
1387
return 0;
@@ -1419,7 +1418,7 @@ static int process_haves_and_send_acks(struct upload_pack_data *data)
1418
struct oid_array common = OID_ARRAY_INIT;
1419
int ret = 0;
1420
1422
- process_haves(&data->haves, &common, &data->have_obj);
1421
+ process_haves(data, &common);
1422
if (data->done) {
1423
ret = 1;
1424
} else if (send_acks(&data->writer, &common,