path: root/pkt-line.c
diff options
authorJohannes Schindelin <>2021-03-15 21:08:19 (GMT)
committerJunio C Hamano <>2021-03-15 21:32:50 (GMT)
commit3a63c6a48c0588a237b3133fe785d6e734dedbb5 (patch)
tree34a9c24d2755dcad66d779f4b792e8f021203c6b /pkt-line.c
parent7455e05e4e750451eb3c33359a2bc9050156750c (diff)
pkt-line: do not issue flush packets in write_packetized_*()
Remove the `packet_flush_gently()` call in `write_packetized_from_buf() and `write_packetized_from_fd()` and require the caller to call it if desired. Rename both functions to `write_packetized_from_*_no_flush()` to prevent later merge accidents. `write_packetized_from_buf()` currently only has one caller: `apply_multi_file_filter()` in `convert.c`. It always wants a flush packet to be written after writing the payload. However, we are about to introduce a caller that wants to write many packets before a final flush packet, so let's make the caller responsible for emitting the flush packet. Signed-off-by: Jeff Hostetler <> Signed-off-by: Johannes Schindelin <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to 'pkt-line.c')
1 files changed, 2 insertions, 6 deletions
diff --git a/pkt-line.c b/pkt-line.c
index 66bd0dd..bb0fb0c 100644
--- a/pkt-line.c
+++ b/pkt-line.c
@@ -251,7 +251,7 @@ void packet_buf_write_len(struct strbuf *buf, const char *data, size_t len)
packet_trace(data, len, 1);
-int write_packetized_from_fd(int fd_in, int fd_out)
+int write_packetized_from_fd_no_flush(int fd_in, int fd_out)
char *buf = xmalloc(LARGE_PACKET_DATA_MAX);
int err = 0;
@@ -267,13 +267,11 @@ int write_packetized_from_fd(int fd_in, int fd_out)
err = packet_write_gently(fd_out, buf, bytes_to_write);
- if (!err)
- err = packet_flush_gently(fd_out);
return err;
-int write_packetized_from_buf(const char *src_in, size_t len, int fd_out)
+int write_packetized_from_buf_no_flush(const char *src_in, size_t len, int fd_out)
int err = 0;
size_t bytes_written = 0;
@@ -289,8 +287,6 @@ int write_packetized_from_buf(const char *src_in, size_t len, int fd_out)
err = packet_write_gently(fd_out, src_in + bytes_written, bytes_to_write);
bytes_written += bytes_to_write;
- if (!err)
- err = packet_flush_gently(fd_out);
return err;