mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-09-27 16:09:00 +02:00
Code Issues Projects Releases Wiki Activity

- coverity based bug fixes - round #1

Browse Source
This commit is contained in:
SoftCoder
2013-12-13 23:04:12 -08:00
parent c887b0c357
commit b9d6b38e8f
53 changed files with 651 additions and 416 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/shared_lib/sources/util/properties.cpp
View File

@@ -426,15 +426,16 @@ int Properties::getInt(const string &key, int min, int max,const char *defaultVa
}
float Properties::getFloat(const string &key, const char *defaultValueIfNotFound) const{
float result = 0.0;
try{
return strToFloat(getString(key,defaultValueIfNotFound));
result = strToFloat(getString(key,defaultValueIfNotFound));
}
catch(exception &e){
SystemFlags::OutputDebug(SystemFlags::debugError,"In [%s::%s Line: %d] Error [%s]\n",extractFileFromDirectoryPath(__FILE__).c_str(),__FUNCTION__,__LINE__,e.what());
//throw megaglest_runtime_error("Error accessing value: " + key + " in: " + path + "\n[" + e.what() + "]");
throw runtime_error("Error accessing value: " + key + " in: " + path + "\n[" + e.what() + "]");
}
return 0.0;
return result;
}
float Properties::getFloat(const string &key, float min, float max, const char *defaultValueIfNotFound) const{
@@ -543,15 +544,16 @@ int Properties::getInt(const char *key,const char *defaultValueIfNotFound) const
}
float Properties::getFloat(const char *key, const char *defaultValueIfNotFound) const{
float result = 0.0;
try{
return strToFloat(getString(key,defaultValueIfNotFound));
result = strToFloat(getString(key,defaultValueIfNotFound));
}
catch(exception &e){
SystemFlags::OutputDebug(SystemFlags::debugError,"In [%s::%s Line: %d] Error [%s]\n",extractFileFromDirectoryPath(__FILE__).c_str(),__FUNCTION__,__LINE__,e.what());
//throw megaglest_runtime_error("Error accessing value: " + string(key) + " in: " + path + "\n[" + e.what() + "]");
throw runtime_error("Error accessing value: " + string(key) + " in: " + path + "\n[" + e.what() + "]");
}
return 0.0;
return result;
}
const string Properties::getString(const char *key, const char *defaultValueIfNotFound) const{