build: cleanup src/helper directory

Change-Id: I71a312df783995e9083c345c25e73902d5aef59e
Signed-off-by: Spencer Oliver <spen@spen-soft.co.uk>
Reviewed-on: http://openocd.zylin.com/415
Tested-by: jenkins

1 files changed, 76 insertions, 92 deletions

diff --git a/src/helper/log.c b/src/helper/log.c
index fa66de06..74fdd657 100644
--- a/src/helper/log.c
+++ b/src/helper/log.c
@@ -23,12 +23,13 @@
  *   Free Software Foundation, Inc.,                                       *
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #include "time_support.h"
-// @todo the inclusion of server.h here is a layering violation
+/* @todo the inclusion of server.h here is a layering violation */
 #include <server/server.h>
 
 #include <stdarg.h>
@@ -43,72 +44,62 @@
 
 int debug_level = -1;
 
-static FILE* log_output;
-static struct log_callback *log_callbacks = NULL;
+static FILE *log_output;
+static struct log_callback *log_callbacks;
 
 static long long last_time;
 static long long current_time;
 
 static long long start;
 
-static char *log_strings[5] =
-{
+static char *log_strings[5] = {
 	"User : ",
 	"Error: ",
-	"Warn : ",  /* want a space after each colon, all same width, colons aligned */
+	"Warn : ",	/* want a space after each colon, all same width, colons aligned */
 	"Info : ",
 	"Debug: "
 };
 
+static int count;
 
-static int count = 0;
-
-
-static struct store_log_forward * log_head = NULL;
-static int log_forward_count = 0;
+static struct store_log_forward *log_head;
+static int log_forward_count;
 
-struct store_log_forward
-{
-	struct store_log_forward * next;
-	const char * file;
+struct store_log_forward {
+	struct store_log_forward *next;
+	const char *file;
 	int line;
-	const char * function;
-	const char * string;
+	const char *function;
+	const char *string;
 };
 
 /* either forward the log to the listeners or store it for possible forwarding later */
 static void log_forward(const char *file, unsigned line, const char *function, const char *string)
 {
-	if (log_forward_count==0)
-	{
+	if (log_forward_count == 0) {
 		struct log_callback *cb, *next;
 		cb = log_callbacks;
 		/* DANGER!!!! the log callback can remove itself!!!! */
-		while (cb)
-		{
+		while (cb) {
 			next = cb->next;
 			cb->fn(cb->priv, file, line, function, string);
 			cb = next;
 		}
-	} else
-	{
-		struct store_log_forward *log = malloc(sizeof (struct store_log_forward));
+	} else {
+		struct store_log_forward *log = malloc(sizeof(struct store_log_forward));
 		log->file = strdup(file);
 		log->line = line;
 		log->function = strdup(function);
 		log->string = strdup(string);
 		log->next = NULL;
-		if (log_head==NULL)
+		if (log_head == NULL)
 			log_head = log;
-		else
-		{
+		else {
 			/* append to tail */
-			struct store_log_forward * t;
+			struct store_log_forward *t;
 			t = log_head;
-			while (t->next!=NULL)
-			{
+			while (t->next != NULL)
 				t = t->next;
-			}
 			t->next = log;
 		}
 	}
@@ -124,11 +115,14 @@ static void log_forward(const char *file, unsigned line, const char *function, c
  * target_request.c).
  *
  */
-static void log_puts(enum log_levels level, const char *file, int line, const char *function, const char *string)
+static void log_puts(enum log_levels level,
+	const char *file,
+	int line,
+	const char *function,
+	const char *string)
 {
 	char *f;
-	if (level == LOG_LVL_OUTPUT)
-	{
+	if (level == LOG_LVL_OUTPUT) {
 		/* do not prepend any headers, just print out what we were given and return */
 		fputs(string, log_output);
 		fflush(log_output);
@@ -139,10 +133,8 @@ static void log_puts(enum log_levels level, const char *file, int line, const ch
 	if (f != NULL)
 		file = f + 1;
 
-	if (strlen(string) > 0)
-	{
-		if (debug_level >= LOG_LVL_DEBUG)
-		{
+	if (strlen(string) > 0) {
+		if (debug_level >= LOG_LVL_DEBUG) {
 			/* print with count and time information */
 			int t = (int)(timeval_ms()-start);
 #ifdef _DEBUG_FREE_SPACE_
@@ -151,37 +143,37 @@ static void log_puts(enum log_levels level, const char *file, int line, const ch
 #endif
 			fprintf(log_output, "%s%d %d %s:%d %s()"
 #ifdef _DEBUG_FREE_SPACE_
-					" %d"
+				" %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,
+				info.fordblks,
 #endif
-					string);
-		}
-		else
-		{
+				string);
+		} else {
 			/* if we are using gdb through pipes then we do not want any output
 			 * to the pipe otherwise we get repeated strings */
 			fprintf(log_output, "%s%s",
-					(level > LOG_LVL_USER)?log_strings[level + 1]:"", string);
+				(level > LOG_LVL_USER) ? log_strings[level + 1] : "", string);
 		}
-	} else
-	{
-		/* Empty strings are sent to log callbacks to keep e.g. gdbserver alive, here we do nothing. */
+	} else {
+		/* Empty strings are sent to log callbacks to keep e.g. gdbserver alive, here we do
+		 *nothing. */
 	}
 
 	fflush(log_output);
 
 	/* Never forward LOG_LVL_DEBUG, too verbose and they can be found in the log if need be */
 	if (level <= LOG_LVL_INFO)
-	{
 		log_forward(file, line, function, string);
-	}
 }
 
-
-void log_printf(enum log_levels level, const char *file, unsigned line, const char *function, const char *format, ...)
+void log_printf(enum log_levels level,
+	const char *file,
+	unsigned line,
+	const char *function,
+	const char *format,
+	...)
 {
 	char *string;
 	va_list ap;
@@ -193,8 +185,7 @@ void log_printf(enum log_levels level, const char *file, unsigned line, const ch
 	va_start(ap, format);
 
 	string = alloc_vprintf(format, ap);
-	if (string != NULL)
-	{
+	if (string != NULL) {
 		log_puts(level, file, line, function, string);
 		free(string);
 	}
@@ -202,7 +193,12 @@ void log_printf(enum log_levels level, const char *file, unsigned line, const ch
 	va_end(ap);
 }
 
-void log_printf_lf(enum log_levels level, const char *file, unsigned line, const char *function, const char *format, ...)
+void log_printf_lf(enum log_levels level,
+	const char *file,
+	unsigned line,
+	const char *function,
+	const char *format,
+	...)
 {
 	char *string;
 	va_list ap;
@@ -214,9 +210,9 @@ void log_printf_lf(enum log_levels level, const char *file, unsigned line, const
 	va_start(ap, format);
 
 	string = alloc_vprintf(format, ap);
-	if (string != NULL)
-	{
-		strcat(string, "\n"); /* alloc_vprintf guaranteed the buffer to be at least one char longer */
+	if (string != NULL) {
+		strcat(string, "\n");	/* alloc_vprintf guaranteed the buffer to be at least one
+					 *char longer */
 		log_puts(level, file, line, function, string);
 		free(string);
 	}
@@ -226,18 +222,15 @@ void log_printf_lf(enum log_levels level, const char *file, unsigned line, const
 
 COMMAND_HANDLER(handle_debug_level_command)
 {
-	if (CMD_ARGC == 1)
-	{
+	if (CMD_ARGC == 1) {
 		int new_level;
 		COMMAND_PARSE_NUMBER(int, CMD_ARGV[0], new_level);
-		if ((debug_level > LOG_LVL_DEBUG) || (new_level < LOG_LVL_SILENT))
-		{
+		if ((debug_level > LOG_LVL_DEBUG) || (new_level < LOG_LVL_SILENT)) {
 			LOG_ERROR("level must be between %d and %d", LOG_LVL_SILENT, LOG_LVL_DEBUG);
 			return ERROR_COMMAND_SYNTAX_ERROR;
 		}
 		debug_level = new_level;
-	}
-	else if (CMD_ARGC > 1)
+	} else if (CMD_ARGC > 1)
 		return ERROR_COMMAND_SYNTAX_ERROR;
 
 	command_print(CMD_CTX, "debug_level: %i", debug_level);
@@ -247,14 +240,11 @@ COMMAND_HANDLER(handle_debug_level_command)
 
 COMMAND_HANDLER(handle_log_output_command)
 {
-	if (CMD_ARGC == 1)
-	{
-		FILE* file = fopen(CMD_ARGV[0], "w");
+	if (CMD_ARGC == 1) {
+		FILE *file = fopen(CMD_ARGV[0], "w");
 
 		if (file)
-		{
 			log_output = file;
-		}
 	}
 
 	return ERROR_OK;
@@ -293,16 +283,13 @@ void log_init(void)
 		debug_level = LOG_LVL_INFO;
 
 	char *debug_env = getenv("OPENOCD_DEBUG_LEVEL");
-	if (NULL != debug_env)
-	{
+	if (NULL != debug_env) {
 		int value;
 		int retval = parse_int(debug_env, &value);
 		if (ERROR_OK == retval &&
 				debug_level >= LOG_LVL_SILENT &&
 				debug_level <= LOG_LVL_DEBUG)
-		{
-			debug_level = value;
-		}
+				debug_level = value;
 	}
 
 	if (log_output == NULL)
@@ -323,14 +310,15 @@ int log_add_callback(log_callback_fn fn, void *priv)
 	struct log_callback *cb;
 
 	/* prevent the same callback to be registered more than once, just for sure */
-	for (cb = log_callbacks; cb; cb = cb->next)
-	{
+	for (cb = log_callbacks; cb; cb = cb->next) {
 		if (cb->fn == fn && cb->priv == priv)
 			return ERROR_COMMAND_SYNTAX_ERROR;
 	}
 
-	/* alloc memory, it is safe just to return in case of an error, no need for the caller to check this */
-	if ((cb = malloc(sizeof(struct log_callback))) == NULL)
+	/* alloc memory, it is safe just to return in case of an error, no need for the caller to
+	 *check this */
+	cb = malloc(sizeof(struct log_callback));
+	if (cb == NULL)
 		return ERROR_BUF_TOO_SMALL;
 
 	/* add item to the beginning of the linked list */
@@ -346,10 +334,8 @@ int log_remove_callback(log_callback_fn fn, void *priv)
 {
 	struct log_callback *cb, **p;
 
-	for (p = &log_callbacks; (cb = *p); p = &(*p)->next)
-	{
-		if (cb->fn == fn && cb->priv == priv)
-		{
+	for (p = &log_callbacks; (cb = *p); p = &(*p)->next) {
+		if (cb->fn == fn && cb->priv == priv) {
 			*p = cb->next;
 			free(cb);
 			return ERROR_OK;
@@ -420,8 +406,7 @@ char *alloc_printf(const char *format, ...)
 void keep_alive()
 {
 	current_time = timeval_ms();
-	if (current_time-last_time > 1000)
-	{
+	if (current_time-last_time > 1000) {
 		extern int gdb_actual_connections;
 
 		if (gdb_actual_connections)
@@ -436,8 +421,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", "");
 
@@ -464,8 +448,7 @@ void kept_alive()
 void alive_sleep(uint64_t ms)
 {
 	uint64_t napTime = 10;
-	for (uint64_t i = 0; i < ms; i += napTime)
-	{
+	for (uint64_t i = 0; i < ms; i += napTime) {
 		uint64_t sleep_a_bit = ms - i;
 		if (sleep_a_bit > napTime)
 			sleep_a_bit = napTime;
@@ -478,8 +461,9 @@ void alive_sleep(uint64_t ms)
 void busy_sleep(uint64_t ms)
 {
 	uint64_t then = timeval_ms();
-	while (timeval_ms() - then < ms)
-	{
-		/* busy wait */
+	while (timeval_ms() - then < ms) {
+		/*
+		 * busy wait
+		 */
 	}
 }