small line ending cleanup.

[openocd] / src / helper / log.c

diff --git a/src/helper/log.c b/src/helper/log.c
index 861e4b376859823413491f31b1ff62ffc2c2ceff..2a77a2704e339d4606200de553eefe97284b371b 100644 (file)
--- a/src/helper/log.c
+++ b/src/helper/log.c
@@ -46,20 +46,14 @@ static char *log_strings[5] =
        "Debug:  "
 };
 
-void log_printf(enum log_levels level, const char *file, int line, const char *function, const char *format, ...)
+static int count = 0;
+
+static void log_printfv(enum log_levels level, const char *file, int line, const char *function, const char *format, va_list args)
 {
-       static int count = 0;
-       count++;
-       va_list args;
        char buffer[512];
        log_callback_t *cb;
 
-       if (level > debug_level)
-               return;
-
-       va_start(args, format);
        vsnprintf(buffer, 512, format, args);
-       va_end(args);
 
        if (level == LOG_OUTPUT)
        {
@@ -76,13 +70,13 @@ void log_printf(enum log_levels level, const char *file, int line, const char *f
        if (debug_level >= LOG_DEBUG)
        {
                /* print with count and time information */
-               time_t t=time(NULL)-start;
-               fprintf(log_output, "%s %d %ld %s:%d %s(): %s\n", log_strings[level+1], count, t, file, line, function, buffer);
+               int t=(int)(time(NULL)-start);
+               fprintf(log_output, "%s %d %d %s:%d %s(): %s", log_strings[level+1], count, t, 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);
+               fprintf(log_output, "%s %s:%d %s(): %s", log_strings[level+1], file, line, function, buffer);
        }
 
        fflush(log_output);
@@ -92,13 +86,40 @@ void log_printf(enum log_levels level, const char *file, int line, const char *f
        {
                for (cb = log_callbacks; cb; cb = cb->next)
                {
-                       va_start(args, format);
                        cb->fn(cb->priv, file, line, function, format, args);
-                       va_end(args);
                }
        }
 }
 
+void log_printf(enum log_levels level, const char *file, int line, const char *function, const char *format, ...)
+{
+       count++;
+       if (level > debug_level)
+               return;
+
+       va_list args;
+       va_start(args, format);
+       log_printfv(level, file, line, function, format, args);
+       va_end(args);
+       
+}
+
+void log_printfnl(enum log_levels level, const char *file, int line, const char *function, const char *format, ...)
+{
+       count++;
+       if (level > debug_level)
+               return;
+       
+       char *t=malloc(strlen(format)+2);
+       strcpy(t, format);
+       strcat(t, "\n");
+       
+       va_list args;
+       va_start(args, format);
+       log_printfv(level, file, line, function, t, args);
+       va_end(args);
+}
+
 /* change the current debug level on the fly
  * 0: only ERRORS
  * 1: + WARNINGS
@@ -197,7 +218,7 @@ int log_remove_callback(log_callback_fn fn, void *priv)
 {
        log_callback_t *cb, **p;
 
-       for (p = &log_callbacks; cb = *p; p = &(*p)->next)
+       for (p = &log_callbacks; (cb = *p); p = &(*p)->next)
        {
            if (cb->fn == fn && cb->priv == priv)
            {