From: ntfreak <ntfreak@b42882b7-edfa-0310-969c-e2dbd0fdcd60>
Date: Fri, 18 Jul 2008 13:31:37 +0000 (+0000)
Subject: - remove build warning from keep_alive
X-Git-Tag: v0.1.0~468
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=2c3f0ebae9499a70314ba4520099d0006eb8e7fe;p=openocd

- remove build warning from keep_alive
- remove surplus linefeeds

git-svn-id: svn://svn.berlios.de/openocd/trunk@831 b42882b7-edfa-0310-969c-e2dbd0fdcd60
---

diff --git a/src/helper/log.c b/src/helper/log.c
index 0a416244..ca9f0a7b 100644
--- a/src/helper/log.c
+++ b/src/helper/log.c
@@ -356,7 +356,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("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)
 	{
diff --git a/src/helper/time_support.c b/src/helper/time_support.c
index e97993be..06c10828 100644
--- a/src/helper/time_support.c
+++ b/src/helper/time_support.c
@@ -110,9 +110,6 @@ int duration_stop_measure(duration_t *duration, char **text)
 	return ERROR_OK;
 }
 
-
-
-
 long long timeval_ms()
 {
 	struct timeval now; 
diff --git a/src/main.c b/src/main.c
index ce6e919f..616aacd4 100644
--- a/src/main.c
+++ b/src/main.c
@@ -29,24 +29,18 @@ void openocd_sleep_postlude()
 {
 }
 
-
-/* 
-	This is the main entry for developer PC hosted OpenOCD.
-	
-	OpenOCD can also be used as a library that is linked with
-	another application(not mainstream yet, but possible), e.g.
-	w/as an embedded application.
-	
-	Those applications will have their own main() implementation
-	and use bits and pieces from openocd.c.
-	
-*/
-
+/* This is the main entry for developer PC hosted OpenOCD.
+ *
+ * OpenOCD can also be used as a library that is linked with
+ * another application(not mainstream yet, but possible), e.g.
+ * w/as an embedded application.
+ * 
+ * Those applications will have their own main() implementation
+ * and use bits and pieces from openocd.c. */
 
 extern int openocd_main(int argc, char *argv[]);
+
 int main(int argc, char *argv[])
 {
 	return openocd_main(argc, argv);
 }
-
-