upload-pack: use upload_pack_data fields in receive_needs()
As we cleanup 'upload-pack.c' by using 'struct upload_pack_data' more thoroughly, let's use fields from this struct in receive_needs(), instead of local variables with the same name and purpose. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Christian Couder committed
May 15, 2020 at 12:04 UTC
7a516764a335412f0a96bc536cf1b408515e5ddc
1 file changed
+13
-15
upload-pack.c
+13
-15
@@ -911,13 +911,7 @@ static int process_deepen_not(const char *line, struct string_list *deepen_not,
911
static void receive_needs(struct upload_pack_data *data,
912
struct packet_reader *reader)
913
{
914
- struct object_array shallows = OBJECT_ARRAY_INIT;
915
- struct string_list deepen_not = STRING_LIST_INIT_DUP;
916
- int depth = 0;
914
int has_non_tip = 0;
918
- timestamp_t deepen_since = 0;
919
- int deepen_rev_list = 0;
920
- int deepen_relative = 0;
915
916
shallow_nr = 0;
917
for (;;) {
@@ -930,13 +924,13 @@ static void receive_needs(struct upload_pack_data *data,
924
if (packet_reader_read(reader) != PACKET_READ_NORMAL)
925
break;
926
933
- if (process_shallow(reader->line, &shallows))
927
+ if (process_shallow(reader->line, &data->shallows))
928
continue;
935
- if (process_deepen(reader->line, &depth))
929
+ if (process_deepen(reader->line, &data->depth))
930
continue;
937
- if (process_deepen_since(reader->line, &deepen_since, &deepen_rev_list))
931
+ if (process_deepen_since(reader->line, &data->deepen_since, &data->deepen_rev_list))
932
continue;
939
- if (process_deepen_not(reader->line, &deepen_not, &deepen_rev_list))
933
+ if (process_deepen_not(reader->line, &data->deepen_not, &data->deepen_rev_list))
934
continue;
935
936
if (skip_prefix(reader->line, "filter ", &arg)) {
@@ -953,7 +947,7 @@ static void receive_needs(struct upload_pack_data *data,
947
"expected to get object ID, not '%s'", reader->line);
948
949
if (parse_feature_request(features, "deepen-relative"))
956
- deepen_relative = 1;
950
+ data->deepen_relative = 1;
951
if (parse_feature_request(features, "multi_ack_detailed"))
952
multi_ack = 2;
953
else if (parse_feature_request(features, "multi_ack"))
@@ -1005,14 +999,18 @@ static void receive_needs(struct upload_pack_data *data,
999
if (!use_sideband && daemon_mode)
1000
no_progress = 1;
1001
1008
- if (depth == 0 && !deepen_rev_list && shallows.nr == 0)
1002
+ if (data->depth == 0 && !data->deepen_rev_list && data->shallows.nr == 0)
1003
return;
1004
1011
- if (send_shallow_list(&data->writer, depth, deepen_rev_list, deepen_since,
1012
- &deepen_not, deepen_relative, &shallows,
1005
+ if (send_shallow_list(&data->writer,
1006
+ data->depth,
1007
+ data->deepen_rev_list,
1008
+ data->deepen_since,
1009
+ &data->deepen_not,
1010
+ data->deepen_relative,
1011
+ &data->shallows,
1012
&data->want_obj))
1013
packet_flush(1);
1015
- object_array_clear(&shallows);
1014
}
1015
1016
/* return non-zero if the ref is hidden, otherwise 0 */