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

fetch-pack: return enum from process_acks() 

process_acks() returns 0, 1, or 2, depending on whether "ready" was
received and if not, whether at least one commit was found to be common.
Replace these magic numbers with a documented enum.

Signed-off-by: Jonathan Tan <jonathantanmy@google.com>
Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Jonathan Tan 2020-04-27 17:01:08 -07:00 committed by Junio C Hamano
parent 7397ca3373
commit d1185aa6fa
1 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
fetch-pack.c
View File

@ -1268,7 +1268,27 @@ static int process_section_header(struct packet_reader *reader,
return ret; return ret;
} }


static int process_acks(struct fetch_negotiator *negotiator, enum common_found {
/*
* No commit was found to be possessed by both the client and the
* server, and "ready" was not received.
*/
NO_COMMON_FOUND,

/*
* At least one commit was found to be possessed by both the client and
* the server, and "ready" was not received.
*/
COMMON_FOUND,

/*
* "ready" was received, indicating that the server is ready to send
* the packfile without any further negotiation.
*/
READY
};

static enum common_found process_acks(struct fetch_negotiator *negotiator,
struct packet_reader *reader, struct packet_reader *reader,
struct oidset *common) struct oidset *common)
{ {
@ -1319,8 +1339,8 @@ static int process_acks(struct fetch_negotiator *negotiator,
if (!received_ready && reader->status != PACKET_READ_FLUSH) if (!received_ready && reader->status != PACKET_READ_FLUSH)
die(_("expected no other sections to be sent after no 'ready'")); die(_("expected no other sections to be sent after no 'ready'"));


/* return 0 if no common, 1 if there are common, or 2 if ready */ return received_ready ? READY :
return received_ready ? 2 : (received_ack ? 1 : 0); (received_ack ? COMMON_FOUND : NO_COMMON_FOUND);
} }


static void receive_shallow_info(struct fetch_pack_args *args, static void receive_shallow_info(struct fetch_pack_args *args,
@ -1508,13 +1528,13 @@ static struct ref *do_fetch_pack_v2(struct fetch_pack_args *args,
case FETCH_PROCESS_ACKS: case FETCH_PROCESS_ACKS:
/* Process ACKs/NAKs */ /* Process ACKs/NAKs */
switch (process_acks(negotiator, &reader, &common)) { switch (process_acks(negotiator, &reader, &common)) {
case 2: case READY:
state = FETCH_GET_PACK; state = FETCH_GET_PACK;
break; break;
case 1: case COMMON_FOUND:
in_vain = 0; in_vain = 0;
/* fallthrough */ /* fallthrough */
default: case NO_COMMON_FOUND:
state = FETCH_SEND_REQUEST; state = FETCH_SEND_REQUEST;
break; break;
} }