- added patch to remove count and time information from log_printf

[openocd.git] / src / helper / log.c

diff --git a/src/helper/log.c b/src/helper/log.c
index 4cdcfc8724d68e56a6cfbe921c68e322ed7406c6..b2f31dc2b87c7eb8086edd57ff999fb7ce41a59f 100644 (file)
--- a/src/helper/log.c
+++ b/src/helper/log.c
@@ -43,12 +43,13 @@ void log_setCallback(logCallback c, void *p)
        privData = p;
 }
 
-static char *log_strings[4] = 
+static char *log_strings[5] = 
 {
+       "User:  ",
        "Error:  ",
        "Warning:",
        "Info:   ",
-       "Debug:  ",
+       "Debug:  "
 };
 
 void log_printf(enum log_levels level, const char *file, int line, const char *function, const char *format, ...)
@@ -68,7 +69,17 @@ void log_printf(enum log_levels level, const char *file, int line, const char *f
        if (f != NULL)
                file = f + 1;
 
-       fprintf(log_output, "%s %d %ld %s:%d %s(): %s\n", log_strings[level], count, time(NULL), file, line, function, buffer);
+       if (debug_level >= LOG_DEBUG)
+       {
+               /* print with count and time information */
+               fprintf(log_output, "%s %d %ld %s:%d %s(): %s\n", log_strings[level+1], count, time(NULL), file, line, function, buffer);
+       }
+       else
+       {
+               /* do not print count and time */
+               fprintf(log_output, "%s %s:%d %s(): %s\n", log_strings[level+1], file, line, function, buffer);
+       }
+
        fflush(log_output);
        
        va_end(args);