From 99089da7fcbf0d3f62ce84158c2c7b3c8f124964 Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Sun, 8 Nov 2015 01:20:11 +0100 Subject: [PATCH] monitor: Support obmission of label when printing packets --- monitor/packet.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/monitor/packet.c b/monitor/packet.c index cbced9726..1a60ce8f1 100644 --- a/monitor/packet.c +++ b/monitor/packet.c @@ -246,7 +246,7 @@ static void print_packet(struct timeval *tv, struct ucred *cred, pos += n; } - n = sprintf(line + pos, "%c %s", ident, label); + n = sprintf(line + pos, "%c %s", ident, label ? label : ""); if (n > 0) { pos += n; len += n; @@ -256,7 +256,8 @@ static void print_packet(struct timeval *tv, struct ucred *cred, int extra_len = extra ? strlen(extra) : 0; int max_len = col - len - extra_len - ts_len - 3; - n = snprintf(line + pos, max_len + 1, ": %s", text); + n = snprintf(line + pos, max_len + 1, "%s%s", + label ? ": " : "", text); if (n > max_len) { line[pos + max_len - 1] = '.'; line[pos + max_len - 2] = '.'; -- 2.47.3