From 3204376b2c88e52d9c366cbd721f3a71918dc583 Mon Sep 17 00:00:00 2001 From: Dmitry Tatarinov Date: Fri, 18 Mar 2016 09:44:37 +0200 Subject: [PATCH] Add file name and line number to log output The changes done in order to support new log output. NOTE: PR#314 (libswiftnav) must be merged first. --- src/sbp.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/sbp.c b/src/sbp.c index a5e417f4..67a0c5ce 100644 --- a/src/sbp.c +++ b/src/sbp.c @@ -334,7 +334,7 @@ int _write(int file, char *ptr, int len) } /** Directs log_ output to the SBP log message */ -void log_(u8 level, const char *msg, ...) +void log_(u8 level, const char *file, const int line, const char *msg, ...) { msg_log_t *log; va_list ap; @@ -344,7 +344,11 @@ void log_(u8 level, const char *msg, ...) log->level = level; va_start(ap, msg); - int n = vsnprintf(log->text, SBP_FRAMING_MAX_PAYLOAD_SIZE-sizeof(msg_log_t), msg, ap); + int n = snprintf(log->text, SBP_FRAMING_MAX_PAYLOAD_SIZE-sizeof(msg_log_t), + "(%s:%d) ", file, line); + va_start(ap, msg); + n += vsnprintf(&log->text[n], SBP_FRAMING_MAX_PAYLOAD_SIZE-sizeof(msg_log_t)-n, + msg, ap); va_end(ap); if (n < 0)