diff options
| author |  Christian Couder <christian.couder@gmail.com> | 2020-06-11 14:05:13 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2020-06-11 13:35:35 -0700 |
| commit | 8dcf22785f33ad65f6ceefa33480dfa09749590a (patch) | |
| tree | 3f76d2bcd3620a7fc11c028323c00fb4ebc7adcd | |
| parent | upload-pack: change allow_unadvertised_object_request to an enum (diff) | |
| download | tgif-8dcf22785f33ad65f6ceefa33480dfa09749590a.tar.xz | |
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>
| -rw-r--r-- | upload-pack.c | 11 |
1 files changed, 5 insertions, 6 deletions
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, |