reduce patch problems by moving $xxx expansion into seperate fn

git-svn-id: svn://svn.berlios.de/openocd/trunk@1027 b42882b7-edfa-0310-969c-e2dbd0fdcd60

1 files changed, 30 insertions, 12 deletions

diff --git a/src/openocd.c b/src/openocd.c
index ccace082..b09ef1e7 100644
--- a/src/openocd.c
+++ b/src/openocd.c
@@ -60,6 +60,34 @@
 
 #include "replacements.h"
 
+
+
+
+
+
+void print_version()
+{
+	/* 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 */
 int handle_version_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
 {
@@ -198,18 +226,8 @@ int openocd_main(int argc, char *argv[])
 	
 	LOG_OUTPUT( "\n\nBUGS? Read http://svn.berlios.de/svnroot/repos/openocd/trunk/BUGS\n\n\n");
 
-	/* 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 */
-
+	print_version();
+	
 	command_context_mode(cmd_ctx, COMMAND_CONFIG);
 	command_set_output_handler(cmd_ctx, configuration_output_handler, NULL);