From 3b4f88057e95418bc548542b5b9a13910905c93d Mon Sep 17 00:00:00 2001 From: Geoff Levand Date: Mon, 13 Aug 2018 09:23:07 -0700 Subject: pb_log: Break out timestamp Fixes double timestamp on pb_log_fn, pb_debug_fn. Signed-off-by: Geoff Levand Signed-off-by: Samuel Mendoza-Jonas --- lib/log/log.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/log/log.c b/lib/log/log.c index 5466d81..7f14232 100644 --- a/lib/log/log.c +++ b/lib/log/log.c @@ -9,7 +9,7 @@ static FILE *logf; static bool debug; -static void __log(const char *fmt, va_list ap) +static void __log_timestamp(void) { char hms[20] = {'\0'}; time_t t; @@ -17,10 +17,15 @@ static void __log(const char *fmt, va_list ap) if (!logf) return; - /* Add timestamp */ t = time(NULL); strftime(hms, sizeof(hms), "%T", localtime(&t)); fprintf(logf, "[%s] ", hms); +} + +static void __log(const char *fmt, va_list ap) +{ + if (!logf) + return; vfprintf(logf, fmt, ap); fflush(logf); @@ -30,6 +35,7 @@ void pb_log(const char *fmt, ...) { va_list ap; va_start(ap, fmt); + __log_timestamp(); __log(fmt, ap); va_end(ap); } @@ -49,6 +55,7 @@ void pb_debug(const char *fmt, ...) if (!debug) return; va_start(ap, fmt); + __log_timestamp(); __log(fmt, ap); va_end(ap); } -- cgit v1.2.1