Pavel Chromy: va_copy should always be paired with va_end.

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

diff --git a/src/helper/log.c b/src/helper/log.c
index 85861988bc52a543732a312c1421eb19e345aa66..694e8a8b2126aa98b181f8bcd8e3c5d1051ebf47 100644 (file)
--- a/src/helper/log.c
+++ b/src/helper/log.c
@@ -48,7 +48,7 @@ static char *log_strings[5] =
 
 static int count = 0;
 
-/* The log_printfv() serves to somewhat different goals:
+/* The log_puts() serves to somewhat different goals:
  * 
  * - logging
  * - feeding low-level info to the user in GDB or Telnet
@@ -60,8 +60,6 @@ static int count = 0;
  */
 static void log_puts(enum log_levels level, const char *file, int line, const char *function, const char *string)
 {
-       log_callback_t *cb;
-
        if (level == LOG_OUTPUT)
        {
                /* do not prepend any headers, just print out what we were given and return */
@@ -80,7 +78,7 @@ static void log_puts(enum log_levels level, const char *file, int line, const ch
                {
                        /* print with count and time information */
                        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, string);
+                       fprintf(log_output, "%s %d %d %s:%d %s(): %s", log_strings[level+1], count, t, file, line, function, string);
                }
                else
                {
@@ -98,10 +96,14 @@ static void log_puts(enum log_levels level, const char *file, int line, const ch
        /* Never forward LOG_DEBUG, too verbose and they can be found in the log if need be */
        if (level <= LOG_INFO)
        {
-               log_callback_t *cb;
-               for (cb = log_callbacks; cb; cb = cb->next)
+               log_callback_t *cb, *next;
+               cb = log_callbacks;
+               /* DANGER!!!! the log callback can remove itself!!!! */
+               while (cb)
                {
+                       next=cb->next;
                        cb->fn(cb->priv, file, line, function, string);
+                       cb=next;
                }
        }
 }
@@ -249,9 +251,9 @@ int log_remove_callback(log_callback_fn fn, void *priv)
 
        for (p = &log_callbacks; (cb = *p); p = &(*p)->next)
        {
-           if (cb->fn == fn && cb->priv == priv)
-           {
-               *p = cb->next;
+               if (cb->fn == fn && cb->priv == priv)
+               {
+                       *p = cb->next;
                        free(cb);
                        return ERROR_OK;
                }
@@ -267,31 +269,36 @@ char *alloc_printf(const char *fmt, va_list ap)
        /* no buffer at the beginning, force realloc to do the job */
        char *string = NULL;
        
-       /* start with minimal length to exercise all the code paths */
-       int size = 1;
+       /* start with buffer size suitable for typical messages */
+       int size = 128;
 
        for (;;)
        {
-               size *= 2; /* double the buffer size */
+               char *t = string;
+               string = realloc(string, size);
+               if (string == NULL)
+               {
+                       if (t != NULL)
+                               free(t);
+                       return NULL;
+               }
 
-                       char *t = string;
-                       string = realloc(string, size);
-                       if (string == NULL)
-                       {
-                               if (t != NULL)
-                                       free(t);
-                               return NULL;
-                       }
-       
-           int ret;
-           ret = vsnprintf(string, size, fmt, ap);
-           /* NB! The result of the vsnprintf() might be an *EMPTY* string! */
-           if ((ret >= 0) && ((ret + 1) < size))
+               va_list ap_copy;
+               va_copy(ap_copy, ap);
+
+               int ret;
+               ret = vsnprintf(string, size, fmt, ap_copy);
+               
+               va_end(ap_copy);
+               
+               /* NB! The result of the vsnprintf() might be an *EMPTY* string! */
+               if ((ret >= 0) && ((ret + 1) < size))
                        break;
 
-           /* there was just enough or not enough space, allocate more in the next round */
+               /* there was just enough or not enough space, allocate more in the next round */
+               size *= 2; /* double the buffer size */
        }
        
        /* the returned buffer is by principle guaranteed to be at least one character longer */
-               return string;
+       return string;
 }