Re: [PATCH v8 05/11] pkt-line: add packet_flush_gently()
From: Jakub Narębski <hidden>
Date: 2016-09-24 22:56:57
W dniu 20.09.2016 o 21:02, larsxschneider@gmail.com pisze:
From: Lars Schneider <redacted> 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 <redacted>
Looks good. I guess the difference in treatment from packet_write_fmt_gently() in the previous patch is that there isn't anything to extract to form a common code function... I have skipped a few iterations of this series.
quoted hunk ↗ jump to hunk
--- pkt-line.c | 8 ++++++++ pkt-line.h | 1 + 2 files changed, 9 insertions(+)diff --git a/pkt-line.c b/pkt-line.c index 3b465fd..19f0271 100644 --- a/pkt-line.c +++ b/pkt-line.c@@ -91,6 +91,14 @@ void packet_flush(int fd) write_or_die(fd, "0000", 4); } +int packet_flush_gently(int fd) +{ + packet_trace("0000", 4, 1); + if (write_in_full(fd, "0000", 4) == 4) + return 0; + return error("flush packet write failed"); +} + void packet_buf_flush(struct strbuf *buf) { packet_trace("0000", 4, 1);diff --git a/pkt-line.h b/pkt-line.h index 3caea77..3fa0899 100644 --- a/pkt-line.h +++ b/pkt-line.h@@ -23,6 +23,7 @@ void packet_flush(int fd); void packet_write_fmt(int fd, const char *fmt, ...) __attribute__((format (printf, 2, 3))); void packet_buf_flush(struct strbuf *buf); void packet_buf_write(struct strbuf *buf, const char *fmt, ...) __attribute__((format (printf, 2, 3))); +int packet_flush_gently(int fd); int packet_write_fmt_gently(int fd, const char *fmt, ...) __attribute__((format (printf, 2, 3))); /*