From da3277b21e4a947691df84eb35f675c6f06a4369 Mon Sep 17 00:00:00 2001
From: Alex <b0ris@b0ris-satellite.localdomain>
Date: Thu, 3 Nov 2011 16:21:29 +0200
Subject: Fix compiler warnings

---
 client/Logger.cpp | 65 ++++++++++++++++++++++++++++---------------------------
 1 file changed, 33 insertions(+), 32 deletions(-)

(limited to 'client/Logger.cpp')

diff --git a/client/Logger.cpp b/client/Logger.cpp
index 4cbb8aa..67c4907 100644
--- a/client/Logger.cpp
+++ b/client/Logger.cpp
@@ -1,97 +1,98 @@
 
 #include <stdio.h>
 #include <stdarg.h>
-#include <string.h>
+#include <string>
 #include <time.h>
 #include "Logger.h"
 
+using std::string;
 
 LogLevelType Logger::LogLevel = TraceLevel;
 
 #ifdef DEBUG
 
-void Logger::Trace(char* msgfmt, ...)
+void Logger::Trace(string msg, ...)
 {
 	va_list args;
-	va_start(args, msgfmt);
-	Logger::Log(TraceLevel, msgfmt, args);
+	va_start(args, msg);
+	Logger::Log(TraceLevel, msg, args);
 }
 
-void Logger::Debug(char* msgfmt, ...)
+void Logger::Debug(string msg, ...)
 {
 	va_list args;
-	va_start(args, msgfmt);
-	Logger::Log(DebugLevel, msgfmt, args);
+	va_start(args, msg);
+	Logger::Log(DebugLevel, msg, args);
 }
 
-void Logger::Info(char* msgfmt, ...)
+void Logger::Info(string msg, ...)
 {
 	va_list args;
-	va_start(args, msgfmt);
-	Logger::Log(InfoLevel, msgfmt, args);
+	va_start(args, msg);
+	Logger::Log(InfoLevel, msg, args);
 }
 
-void Logger::Warn(char* msgfmt, ...)
+void Logger::Warn(string msg, ...)
 {
 	va_list args;
-	va_start(args, msgfmt);
-	Logger::Log(WarnLevel, msgfmt, args);	
+	va_start(args, msg);
+	Logger::Log(WarnLevel, msg, args);	
 }
 
-void Logger::Error(char* msgfmt, ...)
+void Logger::Error(string msg, ...)
 {
 	va_list args;
-	va_start(args, msgfmt);
-	Logger::Log(ErrorLevel, msgfmt, args);
+	va_start(args, msg);
+	Logger::Log(ErrorLevel, msg, args);
 }
 
-void Logger::Fatal(char* msgfmt, ...)
+void Logger::Fatal(string msg, ...)
 {
 	va_list args;
-	va_start(args, msgfmt);
-	Logger::Log(FatalLevel, msgfmt, args);
+	va_start(args, msg);
+	Logger::Log(FatalLevel, msg, args);
 }
 
-void Logger::Log(LogLevelType logLevel, char* msgfmt, ...)
+void Logger::Log(LogLevelType logLevel, string msg, ...)
 {
 	va_list args;
-	va_start(args, msgfmt);
-	Logger::Log(logLevel, msgfmt, args);
+	va_start(args, msg);
+	Logger::Log(logLevel, msg, args);
 }
 
-void Logger::Log(LogLevelType logLevel, char* msgfmt, va_list args)
+void Logger::Log(LogLevelType logLevel, string msg, va_list args)
 {
 	time_t rawtime = time(NULL);
 	struct tm *lctime = localtime(&rawtime);
 	char time_str[10] = {0};
 	strftime(time_str, 10, "%H:%M:%S", lctime);
 		
-	char log_level_str[6] = {0};
+	string log_level_str;
 	switch (logLevel)
 	{
 		default:
 		case TraceLevel:
-			strcpy(log_level_str, "Trace");
+			log_level_str = "Trace";
 			break;
 		case DebugLevel:
-			strcpy(log_level_str, "Debug");
+			log_level_str = "Debug";
 			break;
 		case InfoLevel:
-			strcpy(log_level_str, "Info");
+			log_level_str = "Info";
 			break;
 		case WarnLevel:
-			strcpy(log_level_str, "Warn");
+			log_level_str = "Warn";
 			break;
 		case ErrorLevel:
-			strcpy(log_level_str, "Error");
+			log_level_str = "Error";
 			break;
 		case FatalLevel:
-			strcpy(log_level_str, "Fatal");
+			log_level_str = "Fatal";
 			break;
 	}
 	
-	char *newfmt = new char[strlen(msgfmt) + 24];
-	sprintf(newfmt, "[%s] %-6s: %s", time_str, log_level_str, msgfmt);
+	char *newfmt = new char[msg.size() + 24];
+	sprintf(newfmt, "[%s] %-6s: %s", time_str, log_level_str.c_str(), msg.c_str());
 	vfprintf(stderr, newfmt, args);
 }
 
-- 
cgit v1.2.3