kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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>
maint
Christian Couder 2020-06-11 14:05:13 +02:00 committed by Junio C Hamano
parent 629060d9bb
commit 8dcf22785f
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
upload-pack.c
View File

@ -1348,14 +1348,13 @@ static void process_args(struct packet_reader *request,
die(_("expected flush after fetch arguments")); die(_("expected flush after fetch arguments"));
} }


static int process_haves(struct oid_array *haves, struct oid_array *common, static int process_haves(struct upload_pack_data *data, struct oid_array *common)
struct object_array *have_obj)
{ {
int i; int i;


/* Process haves */ /* Process haves */
for (i = 0; i < haves->nr; i++) { for (i = 0; i < data->haves.nr; i++) {
const struct object_id *oid = &haves->oid[i]; const struct object_id *oid = &data->haves.oid[i];
struct object *o; struct object *o;
int we_knew_they_have = 0; 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; parents->item->object.flags |= THEY_HAVE;
} }
if (!we_knew_they_have) if (!we_knew_they_have)
add_object_array(o, NULL, have_obj); add_object_array(o, NULL, &data->have_obj);
} }


return 0; 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; struct oid_array common = OID_ARRAY_INIT;
int ret = 0; int ret = 0;


process_haves(&data->haves, &common, &data->have_obj); process_haves(data, &common);
if (data->done) { if (data->done) {
ret = 1; ret = 1;
} else if (send_acks(&data->writer, &common, } else if (send_acks(&data->writer, &common,