[PATCH 4/7] Refactor packet_write to prepare to integrate with sideband
From: Shawn O. Pearce <hidden>
Date: 2016-06-15 22:44:09
Subsystem:
the rest · Maintainer:
Linus Torvalds
Simple refactoring to move the actual formatting into a helper function. Later we'll integrate this new helper with sideband support, so we can embed a packet line within a multiplexed sideband stream. Signed-off-by: Shawn O. Pearce <redacted> --- pkt-line.c | 17 +++++++++++++---- 1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/pkt-line.c b/pkt-line.c
index 355546a..5917e1d 100644
--- a/pkt-line.c
+++ b/pkt-line.c@@ -43,16 +43,16 @@ void packet_flush(int fd) } #define hex(a) (hexchar[(a) & 15]) -void packet_write(int fd, const char *fmt, ...) +static void packet_vwrite( + int fd, + const char *fmt, + va_list args) { static char buffer[1000]; static char hexchar[] = "0123456789abcdef"; - va_list args; unsigned n; - va_start(args, fmt); n = vsnprintf(buffer + 4, sizeof(buffer) - 4, fmt, args); - va_end(args); if (n >= sizeof(buffer)-4) die("protocol error: impossibly long line"); n += 4;
@@ -63,6 +63,15 @@ void packet_write(int fd, const char *fmt, ...) safe_write(fd, buffer, n); } +void packet_write(int fd, const char *fmt, ...) +{ + va_list args; + + va_start(args, fmt); + packet_vwrite(fd, fmt, args); + va_end(args); +} + static void safe_read(int fd, void *buffer, unsigned size) { size_t n = 0;
--
1.5.4.rc5.1126.g6ba14