[PATCH v4 03/12] pkt-line: add packet_flush_gentle()
From: <hidden>
Date: 2016-08-03 17:05:00
Subsystem:
the rest · Maintainer:
Linus Torvalds
Possibly related (same subject, not in this thread)
- 2016-08-04 · Re: [PATCH v4 03/12] pkt-line: add packet_flush_gentle() · Junio C Hamano <hidden>
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_gentle() which writes a pkt-line flush packet and returns `0` for success and `1` for failure. Signed-off-by: Lars Schneider <redacted> --- pkt-line.c | 6 ++++++ pkt-line.h | 1 + 2 files changed, 7 insertions(+)
diff --git a/pkt-line.c b/pkt-line.c
index aa158ba..c8a052a 100644
--- a/pkt-line.c
+++ b/pkt-line.c@@ -91,6 +91,12 @@ void packet_flush(int fd) write_or_die(fd, "0000", 4); } +int packet_flush_gently(int fd) +{ + packet_trace("0000", 4, 1); + return !write_or_whine_pipe(fd, "0000", 4, "flush packet"); +} + void packet_buf_flush(struct strbuf *buf) { packet_trace("0000", 4, 1);
diff --git a/pkt-line.h b/pkt-line.h
index ed64511..2fbaee9 100644
--- a/pkt-line.h
+++ b/pkt-line.h@@ -23,6 +23,7 @@ void packet_flush(int fd); void packet_write(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 direct_packet_write(int fd, char *buf, size_t size, int gentle); int direct_packet_write_data(int fd, const char *data, size_t size, int gentle);
--
2.9.0