libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-05 00:36:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

PalmOS:

Browse Source 
- fix crash trying to use emptyString
- debug option

svn-id: r18963
This commit is contained in:
Chris Apers 2005-10-08 19:10:05 +00:00
parent 12f40ae777
commit 8b4f59dc7a
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
common/config-manager.cpp
View File

@ -62,7 +62,7 @@ static bool isValidDomainName(const Common::String &domain) {
namespace Common {
#ifndef PALMOS_ARM
#if !(defined(PALMOS_ARM) || defined(PALMOS_DEBUG))
const String ConfigManager::kApplicationDomain("scummvm");
const String ConfigManager::kTransientDomain("__TRANSIENT");
@ -112,6 +112,7 @@ void ConfigManager::loadDefaultConfigFile() {
strcpy(configFile, DEFAULT_CONFIG_FILE);
#endif
#endif
loadConfigFile(configFile);
}
@ -205,7 +206,7 @@ void ConfigManager::loadFile(const String &filename) {
String key = rtrim(t);
String value = ltrim(p + 1);
set(key, value, domain);
//printf("key : %s | %s\n");
// Store comment
if (_globalDomains.contains(domain)) {
_globalDomains[domain].setKVComment(key, comment);
@ -356,7 +357,6 @@ const String & ConfigManager::get(const String &key, const String &domain) const
// 3) All global domains
// 4) The defaults
if ((domain.isEmpty() || domain == kTransientDomain) && _transientDomain.contains(key))
return _transientDomain[key];
@ -513,7 +513,11 @@ bool ConfigManager::hasGameDomain(const String &domain) const {
const String &ConfigManager::Domain::get(const String &key) const {
Node *node = findNode(_root, key);
#if !(defined(PALMOS_ARM) || defined(PALMOS_DEBUG))
return node ? node->_value : String::emptyString;
#else
return node ? node->_value : ConfMan._emptyString;
#endif
}
void ConfigManager::Domain::setDomainComment(const String &comment) {

4
common/config-manager.h
View File

@ -67,7 +67,7 @@ public:
typedef Map<String, Domain, IgnoreCaseComparator> DomainMap;
#ifndef PALMOS_ARM
#if !(defined(PALMOS_ARM) || defined(PALMOS_DEBUG))
/** The name of the application domain (normally 'scummvm'). */
static const String kApplicationDomain;
@ -76,6 +76,8 @@ public:
#else
static const char *kApplicationDomain;
static const char *kTransientDomain;
const String _emptyString;
#endif
void loadDefaultConfigFile();