(thanks to Øyvind for the patch)
git-svn-id: svn://svn.berlios.de/openocd/trunk@295
b42882b7-edfa-0310-969c-
e2dbd0fdcd60
#include <stdlib.h>
#include <string.h>
#include <stdarg.h>
#include <stdlib.h>
#include <string.h>
#include <stdarg.h>
void log_printf(enum log_levels level, const char *file, int line, const char *function, const char *format, ...)
{
void log_printf(enum log_levels level, const char *file, int line, const char *function, const char *format, ...)
{
+ static int count=0;
+ count++;
va_list args;
char buffer[512];
va_list args;
char buffer[512];
va_start(args, format);
vsnprintf(buffer, 512, format, args);
va_start(args, format);
vsnprintf(buffer, 512, format, args);
- fprintf(log_output, "%s %s:%d %s(): %s\n", log_strings[level], file, line, function, buffer);
+ char *f=strrchr(file, '/');
+ if (f!=NULL)
+ file=f+1;
+
+ fprintf(log_output, "%s %d %d %s:%d %s(): %s\n", log_strings[level], count, time(NULL), file, line, function, buffer);
fflush(log_output);
va_end(args);
fflush(log_output);
va_end(args);
- if (callback)
-{
- va_start(args, format);
+ /* Never forward LOG_DEBUG, too verbose and they can be found in the log if need be */
+ if (callback&&(level<=LOG_INFO))
+
+ {
+ va_start(args, format);
callback(privData, file, line, function, format, args);
callback(privData, file, line, function, format, args);