diff options
| author | Christian Couder <christian.couder@gmail.com> | 2020-06-11 12:05:14 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-06-11 20:35:35 (GMT) |
| commit | 6fbbc4374f79deb2ebabdd60e46364df39ea5f62 (patch) | |
| tree | 91b8977fb8148d9756db54b0ebad8c1c0389fb42 /upload-pack.c | |
| parent | 8dcf22785f33ad65f6ceefa33480dfa09749590a (diff) | |
| download | git-6fbbc4374f79deb2ebabdd60e46364df39ea5f62.zip git-6fbbc4374f79deb2ebabdd60e46364df39ea5f62.tar.gz git-6fbbc4374f79deb2ebabdd60e46364df39ea5f62.tar.bz2 | |
upload-pack: pass upload_pack_data to send_acks()
As we cleanup 'upload-pack.c' by using 'struct upload_pack_data'
more thoroughly, let's pass that struct to send_acks(), 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>
Diffstat (limited to 'upload-pack.c')
| -rw-r--r-- | upload-pack.c | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/upload-pack.c b/upload-pack.c index b20600f..0523fea 100644 --- a/upload-pack.c +++ b/upload-pack.c @@ -1387,26 +1387,24 @@ static int process_haves(struct upload_pack_data *data, struct oid_array *common return 0; } -static int send_acks(struct packet_writer *writer, struct oid_array *acks, - const struct object_array *have_obj, - struct object_array *want_obj) +static int send_acks(struct upload_pack_data *data, struct oid_array *acks) { int i; - packet_writer_write(writer, "acknowledgments\n"); + packet_writer_write(&data->writer, "acknowledgments\n"); /* Send Acks */ if (!acks->nr) - packet_writer_write(writer, "NAK\n"); + packet_writer_write(&data->writer, "NAK\n"); for (i = 0; i < acks->nr; i++) { - packet_writer_write(writer, "ACK %s\n", + packet_writer_write(&data->writer, "ACK %s\n", oid_to_hex(&acks->oid[i])); } - if (ok_to_give_up(have_obj, want_obj)) { + if (ok_to_give_up(&data->have_obj, &data->want_obj)) { /* Send Ready */ - packet_writer_write(writer, "ready\n"); + packet_writer_write(&data->writer, "ready\n"); return 1; } @@ -1421,8 +1419,7 @@ static int process_haves_and_send_acks(struct upload_pack_data *data) process_haves(data, &common); if (data->done) { ret = 1; - } else if (send_acks(&data->writer, &common, - &data->have_obj, &data->want_obj)) { + } else if (send_acks(data, &common)) { packet_writer_delim(&data->writer); ret = 1; } else { |