[PATCH v5 02/15] pkt-line: call packet_trace() only if a packet is actually send
flat view
STALE3701d
From: <hidden>
Date: 2016-08-10 19:44:06
Subsystem:
the rest · Maintainer:
Linus Torvalds
Revision v5 of 11 in this series.
Revisions (11)
From: Lars Schneider <redacted> The packet_trace() call is not ideal in format_packet() as we would print a trace when a packet is formatted and (potentially) when the packet is actually send. This was no problem up until now because format_packet() was only used by one function. Fix it by moving the trace call into the function that actually sends the packet. Signed-off-by: Lars Schneider <redacted> --- pkt-line.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pkt-line.c b/pkt-line.c
index 177dc73..9400b47 100644
--- a/pkt-line.c
+++ b/pkt-line.c@@ -121,7 +121,6 @@ static void format_packet(struct strbuf *out, const char *fmt, va_list args) die("protocol error: impossibly long line"); set_packet_header(&out->buf[orig_len], n); - packet_trace(out->buf + orig_len + 4, n - 4, 1); } void packet_write(int fd, const char *fmt, ...)
@@ -133,6 +132,7 @@ void packet_write(int fd, const char *fmt, ...) va_start(args, fmt); format_packet(&buf, fmt, args); va_end(args); + packet_trace(buf.buf + 4, buf.len - 4, 1); write_or_die(fd, buf.buf, buf.len); }
--
2.9.2