Multiple corrections to code to suppress gcc warnings - identified by Tzafrir Cohen.

git-svn-id: https://oreka.svn.sourceforge.net/svnroot/oreka/trunk@649 09dcff7a-b715-0410-9601-b79a96267cd0

1 files changed, 4 insertions, 4 deletions

diff --git a/orkbasecxx/LogManager.cpp b/orkbasecxx/LogManager.cpp
index 6259a70..f058429 100644
--- a/orkbasecxx/LogManager.cpp
+++ b/orkbasecxx/LogManager.cpp
@@ -30,7 +30,7 @@ void OrkLogManager::Initialize()
 {
 	BasicConfigurator::configure();
 
-	char* logCfgFilename = "";
+	char* logCfgFilename = NULL;
         char* cfgEnvPath = "";
         int cfgAlloc = 0;
 
@@ -51,19 +51,19 @@ void OrkLogManager::Initialize()
                 }
         }
 
-	if(!logCfgFilename || !strlen(logCfgFilename)) {
+	if(!logCfgFilename) {
 		FILE* file = ACE_OS::fopen("logging.properties", "r");
 		if(file)
 		{
 			// logging.properties exists in the current directory
-			logCfgFilename = "logging.properties";
+			logCfgFilename = (char*)"logging.properties";
 			fclose(file);
 		}
 		else
 		{
 			// logging.properties could not be found in the current
 			// directory, try to find it in system configuration directory
-			logCfgFilename = "/etc/orkaudio/logging.properties";
+			logCfgFilename = (char*)"/etc/orkaudio/logging.properties";
 		}
 	}