Switch to strotk() grr....

[openocd] / src / helper / log.c

diff --git a/src/helper/log.c b/src/helper/log.c
index 8dbdc9471bdff3a5cc764f433aa04c25dad4aff3..3ee04e05b1fe097e463250503a6cc075f2792aeb 100644 (file)
--- a/src/helper/log.c
+++ b/src/helper/log.c
@@ -89,12 +89,12 @@ static void log_puts(enum log_levels level, const char *file, int line, const ch
        if (f != NULL)
                file = f + 1;
 
-       if (strchr(string, '\n')!=NULL)
+       if (strchr(string, '\n') != NULL)
        {
                if (debug_level >= LOG_LVL_DEBUG)
                {
                        /* print with count and time information */
-                       int t=(int)(timeval_ms()-start);
+                       int t = (int)(timeval_ms()-start);
 #ifdef _DEBUG_FREE_SPACE_
                        struct mallinfo info;
                        info = mallinfo();
@@ -103,13 +103,13 @@ static void log_puts(enum log_levels level, const char *file, int line, const ch
 #ifdef _DEBUG_FREE_SPACE_
                                        " %d"
 #endif
-                                       ": %s", log_strings[level+1], count, t, file, line, function,
+                                       ": %s", log_strings[level + 1], count, t, file, line, function,
 #ifdef _DEBUG_FREE_SPACE_
                                        info.fordblks,
 #endif
                                        string);
                }
-               else if(server_use_pipes == 0)
+               else if (server_use_pipes == 0)
                {
                        /* if we are using gdb through pipes then we do not want any output
                         * to the pipe otherwise we get repeated strings */
@@ -117,7 +117,7 @@ static void log_puts(enum log_levels level, const char *file, int line, const ch
                        {
                                /* print human readable output - but skip empty lines */
                                fprintf(log_output, "%s%s",
-                                               (level > LOG_LVL_USER)?log_strings[level+1]:"", string);
+                                               (level > LOG_LVL_USER)?log_strings[level + 1]:"", string);
                        }
                }
        } else
@@ -136,9 +136,9 @@ static void log_puts(enum log_levels level, const char *file, int line, const ch
                /* DANGER!!!! the log callback can remove itself!!!! */
                while (cb)
                {
-                       next=cb->next;
+                       next = cb->next;
                        cb->fn(cb->priv, file, line, function, string);
-                       cb=next;
+                       cb = next;
                }
        }
 }
@@ -205,8 +205,6 @@ int handle_debug_level_command(struct command_context_s *cmd_ctx, char *cmd, cha
        else if (argc > 1)
                return ERROR_COMMAND_SYNTAX_ERROR;
 
-       command_print(cmd_ctx, "debug_level: %i", debug_level);
-
        if (debug_level >= LOG_LVL_DEBUG && server_use_pipes == 1)
        {
                /* if we are enabling debug info then we need to write to a log file
@@ -219,6 +217,8 @@ int handle_debug_level_command(struct command_context_s *cmd_ctx, char *cmd, cha
                }
        }
 
+       command_print(cmd_ctx, "debug_level: %i", debug_level);
+
        return ERROR_OK;
 }
 
@@ -259,7 +259,7 @@ int log_init(struct command_context_s *cmd_ctx)
                log_output = stderr;
        }
 
-       start=last_time=timeval_ms();
+       start = last_time = timeval_ms();
 
        return ERROR_OK;
 }
@@ -383,8 +383,8 @@ char *alloc_printf(const char *format, ...)
  */
 void keep_alive()
 {
-       current_time=timeval_ms();
-       if (current_time-last_time>1000)
+       current_time = timeval_ms();
+       if (current_time-last_time > 1000)
        {
                extern int gdb_actual_connections;
 
@@ -400,7 +400,7 @@ void keep_alive()
                                "trouble with GDB connections.",
                                current_time-last_time);
        }
-       if (current_time-last_time>500)
+       if (current_time-last_time > 500)
        {
                /* this will keep the GDB connection alive */
                LOG_USER_N("%s", "");
@@ -413,28 +413,28 @@ void keep_alive()
                 * These functions should be invoked at a well defined spot in server.c
                 */
 
-               last_time=current_time;
+               last_time = current_time;
        }
 }
 
 /* reset keep alive timer without sending message */
 void kept_alive()
 {
-       current_time=timeval_ms();
-       last_time=current_time;
+       current_time = timeval_ms();
+       last_time = current_time;
 }
 
 /* if we sleep for extended periods of time, we must invoke keep_alive() intermittantly */
 void alive_sleep(int ms)
 {
        int i;
-       int napTime=10;
-       for (i=0; i<ms; i+=napTime)
+       int napTime = 10;
+       for (i = 0; i < ms; i += napTime)
        {
-               int sleep_a_bit=ms-i;
-               if (sleep_a_bit>napTime)
+               int sleep_a_bit = ms-i;
+               if (sleep_a_bit > napTime)
                {
-                       sleep_a_bit=napTime;
+                       sleep_a_bit = napTime;
                }
                usleep(sleep_a_bit*1000);
                keep_alive();
@@ -444,8 +444,8 @@ void alive_sleep(int ms)
 void busy_sleep(int ms)
 {
        long long then;
-       then=timeval_ms();
-       while ((timeval_ms()-then)<ms)
+       then = timeval_ms();
+       while ((timeval_ms()-then) < ms)
        {
                /* busy wait */
        }