X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fhelper%2Flog.c;h=567320cdf4b3de1c61cb34778f204f72abf446e1;hp=0a416244829452571c60fbf5cfbd96484717dd28;hb=526fe3d83e118d87af34353a7140c02f3f1a3c19;hpb=94e75e0c06c4d683b33a03aee17b80c8a59bbd47

diff --git a/src/helper/log.c b/src/helper/log.c
index 0a41624482..567320cdf4 100644
--- a/src/helper/log.c
+++ b/src/helper/log.c
@@ -2,6 +2,9 @@
  *   Copyright (C) 2005 by Dominic Rath                                    *
  *   Dominic.Rath@gmx.de                                                   *
  *                                                                         *
+ *   Copyright (C) 2007,2008 Øyvind Harboe                                      *
+ *   oyvind.harboe@zylin.com                                               *
+ *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
@@ -103,8 +106,9 @@ static void log_puts(enum log_levels level, const char *file, int line, const ch
 		}
 		else
 		{
-			/* do not print count and time */
-			fprintf(log_output, "%s %s:%d %s(): %s", log_strings[level+1], file, line, function, string);
+			/* print human readable output */
+			fprintf(log_output, "%s%s",
+					(level > LOG_LVL_USER)?log_strings[level+1]:"", string);
 		}
 	} else
 	{
@@ -356,7 +360,7 @@ void keep_alive()
 	current_time=timeval_ms();
 	if (current_time-last_time>1000)
 	{
-		LOG_WARNING("keep_alive() was not invoked in the 1000ms timelimit. GDB alive packet not sent! (%d)", current_time-last_time); 
+		LOG_WARNING("BUG: keep_alive() was not invoked in the 1000ms timelimit. GDB alive packet not sent! (%lld)", current_time-last_time); 
 		last_time=current_time;
 	} else if (current_time-last_time>500)
 	{