From b3c234d67b82d38b87fe462aa88086e3fdcade0b Mon Sep 17 00:00:00 2001
From: Perttu Ahola <celeron55@gmail.com>
Date: Wed, 29 Oct 2014 17:19:47 +0200
Subject: [PATCH] client/main, server/main: Use less fprintf()

---
 doc/todo.txt        |  8 --------
 src/client/main.cpp | 12 ++++++------
 src/server/main.cpp | 14 +++++++-------
 3 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/doc/todo.txt b/doc/todo.txt
index 6f4ef0e..2b87654 100644
--- a/doc/todo.txt
+++ b/doc/todo.txt
@@ -65,11 +65,3 @@ Buildat TODO
 - If loading a pre-built module fails even while files haven't been modified,
   try building it again (this is sometimes needed when buildat_core is updated
   without header modifications)
-- Don't use fprintf in server/main
-
-Doing now:
-- Automatic buildat root detection so that the server and the client can
-  generally be started with any working directory in either the in-source or
-  windows-installed configuration
-- Allow developing a game outside of the buildat source tree without hassle
-
diff --git a/src/client/main.cpp b/src/client/main.cpp
index 03d53f1..7ac205e 100644
--- a/src/client/main.cpp
+++ b/src/client/main.cpp
@@ -76,19 +76,19 @@ int main(int argc, char *argv[])
 			printf(usagefmt, argv[0]);
 			return 1;
 		case 's':
-			fprintf(stderr, "INFO: config.server_address: %s\n", c55_optarg);
+			log_i(MODULE, "config.server_address: %s", c55_optarg);
 			config.set("server_address", c55_optarg);
 			break;
 		case 'P':
-			fprintf(stderr, "INFO: config.share_path: %s\n", c55_optarg);
+			log_i(MODULE, "config.share_path: %s", c55_optarg);
 			config.set("share_path", c55_optarg);
 			break;
 		case 'C':
-			fprintf(stderr, "INFO: config.cache_path: %s\n", c55_optarg);
+			log_i(MODULE, "config.cache_path: %s", c55_optarg);
 			config.set("cache_path", c55_optarg);
 			break;
 		case 'U':
-			fprintf(stderr, "INFO: config.urho3d_path: %s\n", c55_optarg);
+			log_i(MODULE, "config.urho3d_path: %s", c55_optarg);
 			config.set("urho3d_path", c55_optarg);
 			break;
 		case 'l':
@@ -98,11 +98,11 @@ int main(int argc, char *argv[])
 			log_set_file(c55_optarg);
 			break;
 		case 'm':
-			fprintf(stderr, "INFO: config.menu_extension_name: %s\n", c55_optarg);
+			log_i(MODULE, "config.menu_extension_name: %s", c55_optarg);
 			config.set("menu_extension_name", c55_optarg);
 			break;
 		default:
-			fprintf(stderr, "ERROR: Invalid command-line argument\n");
+			fprintf(stderr, "Invalid command-line argument\n");
 			fprintf(stderr, usagefmt, argv[0]);
 			return 1;
 		}
diff --git a/src/server/main.cpp b/src/server/main.cpp
index 141da35..480283f 100644
--- a/src/server/main.cpp
+++ b/src/server/main.cpp
@@ -101,27 +101,27 @@ int main(int argc, char *argv[])
 			printf(usagefmt, argv[0]);
 			return 1;
 		case 'm':
-			fprintf(stderr, "INFO: module_path: %s\n", c55_optarg);
+			log_i(MODULE, "module_path: %s", c55_optarg);
 			module_path = c55_optarg;
 			break;
 		case 'r':
-			fprintf(stderr, "INFO: config.rccpp_build_path: %s\n", c55_optarg);
+			log_i(MODULE, "config.rccpp_build_path: %s", c55_optarg);
 			config.set("rccpp_build_path", c55_optarg);
 			break;
 		case 'i':
-			fprintf(stderr, "INFO: config.interface_path: %s\n", c55_optarg);
+			log_i(MODULE, "config.interface_path: %s", c55_optarg);
 			config.set("interface_path", c55_optarg);
 			break;
 		case 'S':
-			fprintf(stderr, "INFO: config.share_path: %s\n", c55_optarg);
+			log_i(MODULE, "config.share_path: %s", c55_optarg);
 			config.set("share_path", c55_optarg);
 			break;
 		case 'U':
-			fprintf(stderr, "INFO: config.urho3d_path: %s\n", c55_optarg);
+			log_i(MODULE, "config.urho3d_path: %s", c55_optarg);
 			config.set("urho3d_path", c55_optarg);
 			break;
 		case 'c':
-			fprintf(stderr, "INFO: config.compiler_command: %s\n", c55_optarg);
+			log_i(MODULE, "config.compiler_command: %s", c55_optarg);
 			config.set("compiler_command", c55_optarg);
 			break;
 		case 'l':
@@ -131,7 +131,7 @@ int main(int argc, char *argv[])
 			log_set_file(c55_optarg);
 			break;
 		case 'C':
-			fprintf(stderr, "INFO: config.skip_compiling_modules += %s\n",
+			log_i(MODULE, "config.skip_compiling_modules += %s",
 					c55_optarg);
 			{
 				auto v = config.get<json::Value>("skip_compiling_modules");