Skip to content

Commit 038ce90

Browse files
larsxschneidergitster
authored andcommitted
pkt-line: add packet_flush_gently()
packet_flush() would die in case of a write error even though for some callers an error would be acceptable. Add packet_flush_gently() which writes a pkt-line flush packet like packet_flush() but does not die in case of an error. The function is used in a subsequent patch. Signed-off-by: Lars Schneider <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 70428d1 commit 038ce90

File tree

2 files changed

+9
-0
lines changed

2 files changed

+9
-0
lines changed

pkt-line.c

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,14 @@ void packet_flush(int fd)
9191
write_or_die(fd, "0000", 4);
9292
}
9393

94+
int packet_flush_gently(int fd)
95+
{
96+
packet_trace("0000", 4, 1);
97+
if (write_in_full(fd, "0000", 4) == 4)
98+
return 0;
99+
return error("flush packet write failed");
100+
}
101+
94102
void packet_buf_flush(struct strbuf *buf)
95103
{
96104
packet_trace("0000", 4, 1);

pkt-line.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ void packet_flush(int fd);
2323
void packet_write_fmt(int fd, const char *fmt, ...) __attribute__((format (printf, 2, 3)));
2424
void packet_buf_flush(struct strbuf *buf);
2525
void packet_buf_write(struct strbuf *buf, const char *fmt, ...) __attribute__((format (printf, 2, 3)));
26+
int packet_flush_gently(int fd);
2627
int packet_write_fmt_gently(int fd, const char *fmt, ...) __attribute__((format (printf, 2, 3)));
2728

2829
/*

0 commit comments

Comments
 (0)