X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fopenocd.c;h=86b8aaf27ff384e6dd57b0ea9756e3e677490907;hp=87eac70666984be3f8b9c72ebe4c0ef7c88ff30e;hb=b1f7b35983eade493bfadd9e5abee4ae3dab630d;hpb=53d605e12c3765aeedabf2bfe0c5cc338dc95d5a

diff --git a/src/openocd.c b/src/openocd.c
index 87eac70666..86b8aaf27f 100644
--- a/src/openocd.c
+++ b/src/openocd.c
@@ -2,7 +2,7 @@
  *   Copyright (C) 2005 by Dominic Rath                                    *
  *   Dominic.Rath@gmx.de                                                   *
  *                                                                         *
- *   Copyright (C) 2007,2008 Øyvind Harboe                                 *
+ *   Copyright (C) 2007,2008 Øyvind Harboe                                 *
  *   oyvind.harboe@zylin.com                                               *
  *                                                                         *
  *   Copyright (C) 2008 Richard Missenden                                  *
@@ -49,7 +49,7 @@
 
 
 #define OPENOCD_VERSION \
-		"Open On-Chip Debugger " VERSION " (" PKGBLDDATE ") " RELSTR PKGBLDREV
+		"Open On-Chip Debugger " VERSION RELSTR " (" PKGBLDDATE ")"
 
 static void print_version(void)
 {
@@ -87,10 +87,10 @@ static int log_target_callback_event_handler(struct target_s *target, enum targe
 	switch (event)
 	{
 		case TARGET_EVENT_GDB_START:
-			target->display=0;
+			target->display = 0;
 			break;
 		case TARGET_EVENT_GDB_END:
-			target->display=1;
+			target->display = 1;
 			break;
 		case TARGET_EVENT_HALTED:
 			if (target->display)
@@ -116,11 +116,11 @@ static int handle_init_command(struct command_context_s *cmd_ctx, char *cmd, cha
 		return ERROR_COMMAND_SYNTAX_ERROR;
 
 	int retval;
-	static int initialized=0;
+	static int initialized = 0;
 	if (initialized)
 		return ERROR_OK;
 
-	initialized=1;
+	initialized = 1;
 
 	atexit(exit_handler);
 
@@ -128,7 +128,7 @@ static int handle_init_command(struct command_context_s *cmd_ctx, char *cmd, cha
 		return ERROR_FAIL;
 	LOG_DEBUG("target init complete");
 
-	if ((retval=jtag_interface_init(cmd_ctx)) != ERROR_OK)
+	if ((retval = jtag_interface_init(cmd_ctx)) != ERROR_OK)
 	{
 		/* we must be able to set up the jtag interface */
 		return retval;
@@ -208,7 +208,7 @@ command_context_t *setup_command_handler(void)
 	}
 	LOG_DEBUG("log init complete");
 
-	LOG_OUTPUT( OPENOCD_VERSION "\n" );
+	LOG_OUTPUT(OPENOCD_VERSION "\n");
 
 	register_command(cmd_ctx, NULL, "init", handle_init_command,
 					 COMMAND_ANY, "initializes target and servers - nop on subsequent invocations");
@@ -253,10 +253,11 @@ int openocd_main(int argc, char *argv[])
 	}
 #endif
 
-	LOG_OUTPUT("\n\nBUGS? Read http://svn.berlios.de/svnroot/repos/openocd/trunk/BUGS\n\n\n");
-
 	print_version();
 
+	LOG_OUTPUT("For bug reports, read http://svn.berlios.de/svnroot/repos/openocd/trunk/BUGS\n");
+
+
 	command_context_mode(cmd_ctx, COMMAND_CONFIG);
 	command_set_output_handler(cmd_ctx, configuration_output_handler, NULL);
 
@@ -264,7 +265,7 @@ int openocd_main(int argc, char *argv[])
 		return EXIT_FAILURE;
 
 	ret = parse_config_file(cmd_ctx);
-	if ( (ret != ERROR_OK) && (ret != ERROR_COMMAND_CLOSE_CONNECTION) )
+	if ((ret != ERROR_OK) && (ret != ERROR_COMMAND_CLOSE_CONNECTION))
 		return EXIT_FAILURE;
 
 #if BUILD_HTTPD