X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fhelper%2Flog.c;h=3ee04e05b1fe097e463250503a6cc075f2792aeb;hp=549d71279d9a8f38b226f39ff796920f545a21dc;hb=6d1d58a1fc3dfd60e9cac89460b5a6e438d11efa;hpb=35d8b2bf77645cfc4bc89666640a2907449451ff

diff --git a/src/helper/log.c b/src/helper/log.c
index 549d71279d..3ee04e05b1 100644
--- 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;
 		}
 	}
 }
@@ -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;
 }
 
@@ -258,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;
 }
@@ -382,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;
 
@@ -399,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", "");
@@ -412,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();
@@ -443,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 */
 	}