[PATCH v6 03/13] pkt-line: add packet_write_fmt_gently()
From: <hidden>
Date: 2016-08-25 11:20:16
Subsystem:
the rest · Maintainer:
Linus Torvalds
From: Lars Schneider <redacted> packet_write_fmt() would die in case of a write error even though for some callers an error would be acceptable. Add packet_write_fmt_gently() which writes a formatted pkt-line and returns `0` for success and `-1` for an error. Signed-off-by: Lars Schneider <redacted> --- pkt-line.c | 12 ++++++++++++ pkt-line.h | 1 + 2 files changed, 13 insertions(+)
diff --git a/pkt-line.c b/pkt-line.c
index e8adc0f..3e8b2fb 100644
--- a/pkt-line.c
+++ b/pkt-line.c@@ -137,6 +137,18 @@ void packet_write_fmt(int fd, const char *fmt, ...) write_or_die(fd, buf.buf, buf.len); } +int packet_write_fmt_gently(int fd, const char *fmt, ...) +{ + static struct strbuf buf = STRBUF_INIT; + va_list args; + + strbuf_reset(&buf); + va_start(args, fmt); + format_packet(&buf, fmt, args); + va_end(args); + return (write_in_full(fd, buf.buf, buf.len) == buf.len ? 0 : -1); +} + void packet_buf_write(struct strbuf *buf, const char *fmt, ...) { va_list args;
diff --git a/pkt-line.h b/pkt-line.h
index 1902fb3..3caea77 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_write_fmt_gently(int fd, const char *fmt, ...) __attribute__((format (printf, 2, 3))); /* * Read a packetized line into the buffer, which must be at least size bytes
--
2.9.2