From 08f105df24c562a9c50646a4b35590e5d03ebbda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Mon, 15 Jul 2019 19:11:16 +0200 Subject: [PATCH] =?UTF-8?q?analyze:=20fix=20formatting=20of=20timestamps?= =?UTF-8?q?=20with=200=20=C2=B5s?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit There is a rule that "%.0d" formats 0 as "". There is no such rule for "%0d" and 0 :(. The output had an extra 0 if usec was 0. --- src/analyze/analyze.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/analyze/analyze.c b/src/analyze/analyze.c index b7545c08e2..e9e66b3da6 100644 --- a/src/analyze/analyze.c +++ b/src/analyze/analyze.c @@ -1859,11 +1859,13 @@ static int test_timestamp_one(const char *p) { if (r < 0) return r; - r = table_add_cell_stringf(table, &cell, "@%"PRI_USEC"%s%0*"PRI_USEC"", - usec / USEC_PER_SEC, - usec % USEC_PER_SEC ? "." : "", - usec % USEC_PER_SEC ? 6 : 0, - usec % USEC_PER_SEC); + if (usec % USEC_PER_SEC == 0) + r = table_add_cell_stringf(table, &cell, "@%"PRI_USEC, + usec / USEC_PER_SEC); + else + r = table_add_cell_stringf(table, &cell, "@%"PRI_USEC".%06"PRI_USEC"", + usec / USEC_PER_SEC, + usec % USEC_PER_SEC); if (r < 0) return r;