pkt-line: replace "stateless separator" with "response end"

Denton-L · gitster · commit 8232a0ff48ce · 2021-07-09T11:51:17.000-07:00
In 0181b60 (pkt-line: define PACKET_READ_RESPONSE_END, 2020-05-19), the Response End packet was defined for Git's network protocol. When the patch was sent, it included an oversight where the error messages referenced "stateless separator", the work-in-progress name, over "response end", the final name chosen. Correct these error messages by having them correctly reference a "response end" packet. Signed-off-by: Denton Liu <liu.denton@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
diff --git a/pkt-line.c b/pkt-line.c
@@ -103,7 +103,7 @@ void packet_response_end(int fd)
 {
 	packet_trace("0002", 4, 1);
 	if (write_in_full(fd, "0002", 4) < 0)
-		die_errno(_("unable to write stateless separator packet"));
+		die_errno(_("unable to write response end packet"));
 }
 
 int packet_flush_gently(int fd)
diff --git a/remote-curl.c b/remote-curl.c
@@ -602,7 +602,7 @@ static int rpc_read_from_out(struct rpc_state *rpc, int options,
 			memcpy(buf - 4, "0000", 4);
 			break;
 		case PACKET_READ_RESPONSE_END:
-			die(_("remote server sent stateless separator"));
+			die(_("remote server sent unexpected response end packet"));
 		}
 	}
 
diff --git a/serve.c b/serve.c
@@ -218,7 +218,7 @@ static int process_request(void)
 			state = PROCESS_REQUEST_DONE;
 			break;
 		case PACKET_READ_RESPONSE_END:
-			BUG("unexpected stateless separator packet");
+			BUG("unexpected response end packet");
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ void packet_response_end(int fd)`
`103`	`103`	`{`
`104`	`104`	`packet_trace("0002", 4, 1);`
`105`	`105`	`if (write_in_full(fd, "0002", 4) < 0)`
`106`		`- die_errno(_("unable to write stateless separator packet"));`
	`106`	`+ die_errno(_("unable to write response end packet"));`
`107`	`107`	`}`
`108`	`108`
`109`	`109`	`int packet_flush_gently(int fd)`
Original file line number	Diff line number	Diff line change
`@@ -602,7 +602,7 @@ static int rpc_read_from_out(struct rpc_state *rpc, int options,`
`602`	`602`	`memcpy(buf - 4, "0000", 4);`
`603`	`603`	`break;`
`604`	`604`	`case PACKET_READ_RESPONSE_END:`
`605`		`- die(_("remote server sent stateless separator"));`
	`605`	`+ die(_("remote server sent unexpected response end packet"));`
`606`	`606`	`}`
`607`	`607`	`}`
`608`	`608`
Original file line number	Diff line number	Diff line change
`@@ -218,7 +218,7 @@ static int process_request(void)`
`218`	`218`	`state = PROCESS_REQUEST_DONE;`
`219`	`219`	`break;`
`220`	`220`	`case PACKET_READ_RESPONSE_END:`
`221`		`- BUG("unexpected stateless separator packet");`
	`221`	`+ BUG("unexpected response end packet");`
`222`	`222`	`}`
`223`	`223`	`}`
`224`	`224`