As we cleanup 'upload-pack.c' by using 'struct upload_pack_data'
more thoroughly, let's take this opportunity to change the
'multi_ack' variable, which is now part of 'upload_pack_data',
to an enum.
This will make it clear which values this variable can take.
Signed-off-by: Christian Couder <chriscool@xxxxxxxxxxxxx>
---
upload-pack.c | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/upload-pack.c b/upload-pack.c
index f8611a5d53..83270452d4 100644
--- a/upload-pack.c
+++ b/upload-pack.c
@@ -80,7 +80,11 @@ struct upload_pack_data {
int deepen_relative;
unsigned int timeout; /* v0 only */
- int multi_ack; /* v0 only */
+ enum {
+ no_multi_ack = 0,
+ multi_ack = 1,
+ multi_ack_detailed = 2
+ } multi_ack; /* v0 only */
/* 0 for no sideband, otherwise DEFAULT_PACKET_MAX or LARGE_PACKET_MAX */
int use_sideband;
@@ -441,7 +445,7 @@ static int get_common_commits(struct upload_pack_data *data,
reset_timeout(data->timeout);
if (packet_reader_read(reader) != PACKET_READ_NORMAL) {
- if (data->multi_ack == 2
+ if (data->multi_ack == multi_ack_detailed
&& got_common
&& !got_other
&& ok_to_give_up(&data->have_obj, &data->want_obj)) {
@@ -468,7 +472,7 @@ static int get_common_commits(struct upload_pack_data *data,
if (data->multi_ack
&& ok_to_give_up(&data->have_obj, &data->want_obj)) {
const char *hex = oid_to_hex(&oid);
- if (data->multi_ack == 2) {
+ if (data->multi_ack == multi_ack_detailed) {
sent_ready = 1;
packet_write_fmt(1, "ACK %s ready\n", hex);
} else
@@ -478,7 +482,7 @@ static int get_common_commits(struct upload_pack_data *data,
default:
got_common = 1;
oid_to_hex_r(last_hex, &oid);
- if (data->multi_ack == 2)
+ if (data->multi_ack == multi_ack_detailed)
packet_write_fmt(1, "ACK %s common\n", last_hex);
else if (data->multi_ack)
packet_write_fmt(1, "ACK %s continue\n", last_hex);
@@ -958,9 +962,9 @@ static void receive_needs(struct upload_pack_data *data,
if (parse_feature_request(features, "deepen-relative"))
data->deepen_relative = 1;
if (parse_feature_request(features, "multi_ack_detailed"))
- data->multi_ack = 2;
+ data->multi_ack = multi_ack_detailed;
else if (parse_feature_request(features, "multi_ack"))
- data->multi_ack = 1;
+ data->multi_ack = multi_ack;
if (parse_feature_request(features, "no-done"))
data->no_done = 1;
if (parse_feature_request(features, "thin-pack"))
--
2.27.0.rc0.26.g636377a2c4
