From d893b09863d808bf4127a011f3e76f8ae7433082 Mon Sep 17 00:00:00 2001 From: Tzafrir Cohen Date: Tue, 22 Sep 2009 22:51:43 +0300 Subject: avoid some more warnings in orkbasecxx mainly constifications --- orkbasecxx/LogManager.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'orkbasecxx/LogManager.cpp') diff --git a/orkbasecxx/LogManager.cpp b/orkbasecxx/LogManager.cpp index 6259a70..552d1eb 100644 --- a/orkbasecxx/LogManager.cpp +++ b/orkbasecxx/LogManager.cpp @@ -30,8 +30,8 @@ void OrkLogManager::Initialize() { BasicConfigurator::configure(); - char* logCfgFilename = ""; - char* cfgEnvPath = ""; + char* logCfgFilename = NULL; + const char* cfgEnvPath = ""; int cfgAlloc = 0; cfgEnvPath = ACE_OS::getenv("ORKAUDIO_CONFIG_PATH"); @@ -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"; } } -- cgit v1.2.3