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/ConfigManager.cpp b/orkbasecxx/ConfigManager.cpp
index 85ad41e..1dff7d8 100644
--- a/orkbasecxx/ConfigManager.cpp
+++ b/orkbasecxx/ConfigManager.cpp
@@ -48,7 +48,7 @@ void ConfigManager::Initialize()
 
 	try
 	{
-		char* cfgFilename = ""; 
+		char* cfgFilename = NULL;
 		char* cfgEnvPath = "";
 		int cfgAlloc = 0;
 
@@ -69,19 +69,19 @@ void ConfigManager::Initialize()
 			}
 		}
 
-		if(!cfgFilename || !strlen(cfgFilename)) {
+		if(!cfgFilename) {
 			FILE* file = ACE_OS::fopen(CONFIG_FILE_NAME, "r");
 			if(file)
 			{
 				// config.xml exists in the current directory
-				cfgFilename = CONFIG_FILE_NAME;
+				cfgFilename = (char*)CONFIG_FILE_NAME;
 				fclose(file);
 			}
 			else
 			{
 				// config.xml could not be found in the current
 				// directory, try to find it in system configuration directory
-				cfgFilename = ETC_CONFIG_FILE_NAME;
+				cfgFilename = (char*)ETC_CONFIG_FILE_NAME;
 			}
 		}