X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fopenocd.c;h=234b01c2f3141f10a2e67d876de0ae23f75d3b4d;hb=f30136603e4cc8b2db0112a32f26959d5201e58c;hp=d67ebd59b176273a1be992ef3b6e3a38da08120e;hpb=89870c86e7aafd81a5720fcfd30002d24d26b232;p=openocd.git

diff --git a/src/openocd.c b/src/openocd.c
index d67ebd59b1..234b01c2f3 100644
--- a/src/openocd.c
+++ b/src/openocd.c
@@ -51,21 +51,6 @@
 #define OPENOCD_VERSION \
 		"Open On-Chip Debugger " VERSION RELSTR " (" PKGBLDDATE ")"
 
-static void print_version(void)
-{
-	/* DANGER!!! make sure that the line below does not appear in a patch, do not remove */
-	/* DANGER!!! make sure that the line below does not appear in a patch, do not remove */
-	/* DANGER!!! make sure that the line below does not appear in a patch, do not remove */
-	/* DANGER!!! make sure that the line below does not appear in a patch, do not remove */
-	/* DANGER!!! make sure that the line below does not appear in a patch, do not remove */
-	LOG_OUTPUT("$URL$\n");
-	/* DANGER!!! make sure that the line above does not appear in a patch, do not remove */
-	/* DANGER!!! make sure that the line above does not appear in a patch, do not remove */
-	/* DANGER!!! make sure that the line above does not appear in a patch, do not remove */
-	/* DANGER!!! make sure that the line above does not appear in a patch, do not remove */
-	/* DANGER!!! make sure that the line above does not appear in a patch, do not remove */
-}
-
 /* Give TELNET a way to find out what version this is */
 COMMAND_HANDLER(handle_version_command)
 {
@@ -82,7 +67,7 @@ static void exit_handler(void)
 	jtag_interface_quit();
 }
 
-static int log_target_callback_event_handler(struct target_s *target, enum target_event event, void *priv)
+static int log_target_callback_event_handler(struct target *target, enum target_event event, void *priv)
 {
 	switch (event)
 	{
@@ -106,7 +91,7 @@ static int log_target_callback_event_handler(struct target_s *target, enum targe
 	return ERROR_OK;
 }
 
-int ioutil_init(struct command_context_s *cmd_ctx);
+int ioutil_init(struct command_context *cmd_ctx);
 
 /* OpenOCD can't really handle failure of this command. Patches welcome! :-) */
 COMMAND_HANDLER(handle_init_command)
@@ -175,15 +160,15 @@ COMMAND_HANDLER(handle_init_command)
 	return ERROR_OK;
 }
 
-command_context_t *global_cmd_ctx;
+struct command_context *global_cmd_ctx;
 
 /// src/hello.c gives a simple example for writing new command modules
-int hello_register_commands(struct command_context_s *cmd_ctx);
+int hello_register_commands(struct command_context *cmd_ctx);
 
 /* NB! this fn can be invoked outside this file for non PC hosted builds */
-command_context_t *setup_command_handler(void)
+struct command_context *setup_command_handler(void)
 {
-	command_context_t *cmd_ctx;
+	struct command_context *cmd_ctx;
 
 	global_cmd_ctx = cmd_ctx = command_init();
 
@@ -246,7 +231,7 @@ int openocd_main(int argc, char *argv[])
 	int ret;
 
 	/* initialize commandline interface */
-	command_context_t *cmd_ctx;
+	struct command_context *cmd_ctx;
 
 	cmd_ctx = setup_command_handler();
 
@@ -257,8 +242,6 @@ int openocd_main(int argc, char *argv[])
 	}
 #endif
 
-	print_version();
-
 	LOG_OUTPUT("For bug reports, read\n\t"
 		"http://openocd.berlios.de/doc/doxygen/bugs.html"
 		"\n");