diff options
| author | Lars Schneider <larsxschneider@gmail.com> | 2016-10-16 16:20:32 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-10-17 11:36:50 -0700 |
| commit | 038ce90f2ff91587f2d61993f5c4c23d6fdca144 (patch) | |
| tree | 649900624f101604aa7b3aa50fab62ee3112ca7a | |
| parent | 70428d1a5209f8c9996e9a4e0cc2f7aa0f83f3e8 (diff) | |
| download | git-038ce90f2ff91587f2d61993f5c4c23d6fdca144.tar.gz git-038ce90f2ff91587f2d61993f5c4c23d6fdca144.tar.xz | |
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>
| -rw-r--r-- | pkt-line.c | 8 | ||||
| -rw-r--r-- | pkt-line.h | 1 |
2 files changed, 9 insertions, 0 deletions
diff --git a/pkt-line.c b/pkt-line.c index 3288ff07d..62b89dbe3 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 3caea7772..3fa089948 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))); /* |