(svn r20021) -Codechange: Move variable declarations.

2 files changed, 8 insertions, 20 deletions

diff --git a/src/console.cpp b/src/console.cpp
index ff8b68046..9aa43f4dd 100644
--- a/src/console.cpp
+++ b/src/console.cpp
@@ -386,9 +386,6 @@ static void IConsoleAliasExec(const IConsoleAlias *alias, byte tokencount, char
  */
 void IConsoleCmdExec(const char *cmdstr)
 {
-	IConsoleCmd   *cmd    = NULL;
-	IConsoleAlias *alias  = NULL;
-
 	const char *cmdptr;
 	char *tokens[ICON_TOKEN_COUNT], tokenstream[ICON_MAX_STREAMSIZE];
 	uint t_index, tstream_i;
@@ -463,7 +460,7 @@ void IConsoleCmdExec(const char *cmdstr)
 	 * First try commands, then aliases. Execute
 	 * the found action taking into account its hooking code
 	 */
-	cmd = IConsoleCmdGet(tokens[0]);
+	IConsoleCmd *cmd = IConsoleCmdGet(tokens[0]);
 	if (cmd != NULL) {
 		ConsoleHookResult chr = (cmd->hook == NULL ? CHR_ALLOW : cmd->hook(true));
 		switch (chr) {
@@ -479,7 +476,7 @@ void IConsoleCmdExec(const char *cmdstr)
 	}
 
 	t_index--;
-	alias = IConsoleAliasGet(tokens[0]);
+	IConsoleAlias *alias = IConsoleAliasGet(tokens[0]);
 	if (alias != NULL) {
 		IConsoleAliasExec(alias, t_index, &tokens[1]);
 		return;
diff --git a/src/console_cmds.cpp b/src/console_cmds.cpp
index 71f6f10b4..fff0788aa 100644
--- a/src/console_cmds.cpp
+++ b/src/console_cmds.cpp
@@ -860,9 +860,6 @@ DEF_CONSOLE_CMD(ConNetworkConnect)
 
 DEF_CONSOLE_CMD(ConExec)
 {
-	char cmdline[ICON_CMDLN_SIZE];
-	char *cmdptr;
-
 	if (argc == 0) {
 		IConsoleHelp("Execute a local script file. Usage: 'exec <script> <?>'");
 		return true;
@@ -879,9 +876,10 @@ DEF_CONSOLE_CMD(ConExec)
 
 	_script_running = true;
 
+	char cmdline[ICON_CMDLN_SIZE];
 	while (_script_running && fgets(cmdline, sizeof(cmdline), script_file) != NULL) {
 		/* Remove newline characters from the executing script */
-		for (cmdptr = cmdline; *cmdptr != '\0'; cmdptr++) {
+		for (char *cmdptr = cmdline; *cmdptr != '\0'; cmdptr++) {
 			if (*cmdptr == '\n' || *cmdptr == '\r') {
 				*cmdptr = '\0';
 				break;
@@ -1246,8 +1244,6 @@ DEF_CONSOLE_CMD(ConScreenShot)
 
 DEF_CONSOLE_CMD(ConInfoCmd)
 {
-	const IConsoleCmd *cmd;
-
 	if (argc == 0) {
 		IConsoleHelp("Print out debugging information about a command. Usage: 'info_cmd <cmd>'");
 		return true;
@@ -1255,7 +1251,7 @@ DEF_CONSOLE_CMD(ConInfoCmd)
 
 	if (argc < 2) return false;
 
-	cmd = IConsoleCmdGet(argv[1]);
+	const IConsoleCmd *cmd = IConsoleCmdGet(argv[1]);
 	if (cmd == NULL) {
 		IConsoleError("the given command was not found");
 		return true;
@@ -1355,14 +1351,12 @@ DEF_CONSOLE_CMD(ConHelp)
 
 DEF_CONSOLE_CMD(ConListCommands)
 {
-	const IConsoleCmd *cmd;
-
 	if (argc == 0) {
 		IConsoleHelp("List all registered commands. Usage: 'list_cmds [<pre-filter>]'");
 		return true;
 	}
 
-	for (cmd = _iconsole_cmds; cmd != NULL; cmd = cmd->next) {
+	for (const IConsoleCmd *cmd = _iconsole_cmds; cmd != NULL; cmd = cmd->next) {
 		if (argv[1] == NULL || strstr(cmd->name, argv[1]) != NULL) {
 			if (cmd->hook == NULL || cmd->hook(false) != CHR_HIDE) IConsolePrintF(CC_DEFAULT, "%s", cmd->name);
 		}
@@ -1373,14 +1367,12 @@ DEF_CONSOLE_CMD(ConListCommands)
 
 DEF_CONSOLE_CMD(ConListAliases)
 {
-	const IConsoleAlias *alias;
-
 	if (argc == 0) {
 		IConsoleHelp("List all registered aliases. Usage: 'list_aliases [<pre-filter>]'");
 		return true;
 	}
 
-	for (alias = _iconsole_aliases; alias != NULL; alias = alias->next) {
+	for (const IConsoleAlias *alias = _iconsole_aliases; alias != NULL; alias = alias->next) {
 		if (argv[1] == NULL || strstr(alias->name, argv[1]) != NULL) {
 			IConsolePrintF(CC_DEFAULT, "%s => %s", alias->name, alias->cmdline);
 		}
@@ -1411,8 +1403,6 @@ DEF_CONSOLE_CMD(ConSay)
 
 DEF_CONSOLE_CMD(ConCompanies)
 {
-	Company *c;
-
 	if (argc == 0) {
 		IConsoleHelp("List the in-game details of all clients connected to the server. Usage 'companies'");
 		return true;
@@ -1420,6 +1410,7 @@ DEF_CONSOLE_CMD(ConCompanies)
 	NetworkCompanyStats company_stats[MAX_COMPANIES];
 	NetworkPopulateCompanyStats(company_stats);
 
+	Company *c;
 	FOR_ALL_COMPANIES(c) {
 		/* Grab the company name */
 		char company_name[NETWORK_COMPANY_NAME_LENGTH];