From 47cee7b40868fddcc5f06d5be80bc793d48d3a3b Mon Sep 17 00:00:00 2001 From: Sebastien GODARD Date: Sat, 10 Dec 2022 14:17:02 +0100 Subject: [PATCH] sadf: RAW: Fix extra space when no TZ printed Signed-off-by: Sebastien GODARD --- sadf_misc.c | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/sadf_misc.c b/sadf_misc.c index e9a3f23..3fef6bc 100644 --- a/sadf_misc.c +++ b/sadf_misc.c @@ -833,12 +833,14 @@ char *print_dbppc_timestamp(int fmt, struct file_header *file_hdr, char *cur_dat strcpy(temp2, temp1); } - if (strlen(cur_date) && (!PRINT_TRUE_TIME(flags) || (PRINT_TRUE_TIME(flags) && strlen(file_hdr->sa_tzname)))) { + if (strlen(cur_date) && (!PRINT_TRUE_TIME(flags) || + (PRINT_TRUE_TIME(flags) && strlen(file_hdr->sa_tzname)))) { snprintf(pre, sizeof(pre), "%s%s %s", temp2, cur_time, - PRINT_LOCAL_TIME(flags) ? my_tz - : (PRINT_TRUE_TIME(flags) ? file_hdr->sa_tzname - : "UTC")); - } else { + PRINT_LOCAL_TIME(flags) ? my_tz + : (PRINT_TRUE_TIME(flags) ? file_hdr->sa_tzname + : "UTC")); + } + else { snprintf(pre, sizeof(pre), "%s%s", temp2, cur_time); } @@ -1030,12 +1032,18 @@ __tm_funct_t print_raw_timestamp(void *parm, int action, char *cur_date, static char pre[80]; if (action & F_BEGIN) { - snprintf(pre, sizeof(pre), "%s %s", cur_time, - strlen(cur_date) ? (PRINT_LOCAL_TIME(flags) ? my_tz - : (PRINT_TRUE_TIME(flags) ? file_hdr->sa_tzname - : "UTC")) - : ""); + if (strlen(cur_date) && (!PRINT_TRUE_TIME(flags) || + (PRINT_TRUE_TIME(flags) && strlen(file_hdr->sa_tzname)))) { + snprintf(pre, sizeof(pre), "%s %s", cur_time, + PRINT_LOCAL_TIME(flags) ? my_tz + : (PRINT_TRUE_TIME(flags) ? file_hdr->sa_tzname + : "UTC")); + } + else { + snprintf(pre, sizeof(pre), "%s", cur_time); + } pre[sizeof(pre) - 1] = '\0'; + return pre; } -- 2.40.0