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 <larsxschneider@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Lars Schneider committed
Oct 16, 2016 at 16:20 UTC
038ce90f2ff91587f2d61993f5c4c23d6fdca144
2 files changed
+9
pkt-line.c
+8
@@ -91,6 +91,14 @@ void packet_flush(int fd)
91
write_or_die(fd, "0000", 4);
92
}
93
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
+
102
void packet_buf_flush(struct strbuf *buf)
103
{
104
packet_trace("0000", 4, 1);
pkt-line.h
+1
@@ -23,6 +23,7 @@ void packet_flush(int fd);
23
void packet_write_fmt(int fd, const char *fmt, ...) __attribute__((format (printf, 2, 3)));
24
void packet_buf_flush(struct strbuf *buf);
25
void packet_buf_write(struct strbuf *buf, const char *fmt, ...) __attribute__((format (printf, 2, 3)));
26
+int packet_flush_gently(int fd);
27
int packet_write_fmt_gently(int fd, const char *fmt, ...) __attribute__((format (printf, 2, 3)));
28
29
/*