- Fixes '[+]=' whitespace

[fw/openocd] / src / helper / log.c

diff --git a/src/helper/log.c b/src/helper/log.c
index 549d71279d9a8f38b226f39ff796920f545a21dc..0e04af6f6bb88b7151e75b96dcdadb88344521e1 100644 (file)
--- a/src/helper/log.c
+++ b/src/helper/log.c
@@ -89,7 +89,7 @@ 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)
                {
@@ -109,7 +109,7 @@ static void log_puts(enum log_levels level, const char *file, int line, const ch
 #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 */
@@ -194,17 +194,16 @@ void log_printf_lf(enum log_levels level, const char *file, int line, const char
  */
 int handle_debug_level_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
 {
-       if (argc == 0)
-               command_print(cmd_ctx, "debug_level: %i", debug_level);
-
-       if (argc > 0)
-               debug_level = strtoul(args[0], NULL, 0);
-
-       if (debug_level < 0)
-               debug_level = 0;
-
-       if (debug_level > 3)
-               debug_level = 3;
+       if (argc == 1)
+       {
+               unsigned new_level;
+               int retval = parse_uint(args[0], &new_level);
+               if (ERROR_OK != retval)
+                       return retval;
+               debug_level = MIN(new_level, LOG_LVL_DEBUG);
+       }
+       else if (argc > 1)
+               return ERROR_COMMAND_SYNTAX_ERROR;
 
        if (debug_level >= LOG_LVL_DEBUG && server_use_pipes == 1)
        {
@@ -218,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;
 }
 
@@ -428,7 +429,7 @@ void alive_sleep(int ms)
 {
        int i;
        int napTime=10;
-       for (i=0; i<ms; i+=napTime)
+       for (i=0; i<ms; i += napTime)
        {
                int sleep_a_bit=ms-i;
                if (sleep_a_bit>napTime)