- 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 0a416244829452571c60fbf5cfbd96484717dd28..ca9f0a7b45d1dadc4cdb2acb9844092c6d348c28 100644 (file)
--- 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 e97993be6a298d6db98b5f6c8634c3d1cb643c01..06c10828ab164e341a9ef4611eaa8981f529bfba 100644 (file)
--- 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 ce6e919f9a84f7e83ada0c7aa7a8176ef408c1f8..616aacd485a5801dc66b891bff78584413b6f134 100644 (file)
--- 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);
 }
-
-