[PATCH v3 03/10] pkt-line: add packet_flush_gentle()
- From
larsxschneider@gmail.com <larsxschneider@gmail.com>
- Date
- Jul 29, 2016, 23:37 UTC
- Message-ID
- <20160729233801.82844-4-larsxschneider@gmail.com>
- In-Reply-To
- <20160729233801.82844-1-larsxschneider@gmail.com>
From: Lars Schneider <larsxschneider@gmail.com>
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 <larsxschneider@gmail.com> --- pkt-line.c | 6 ++++++ pkt-line.h | 1 + 2 files changed, 7 insertions(+)
diff --git a/pkt-line.c b/pkt-line.c index 6fae508..1728690 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_gentle(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 02dcced..3953c98 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_gentle(int fd); int direct_packet_write(int fd, char *buf, size_t size, int gentle); int direct_packet_write_data(int fd, const char *buf, size_t size, int gentle);
-- 2.9.0