fixed getStringValue failure case and compiler warnings
Marius Nita marius@cs.pdx.edu
2 files changed,
7 insertions(+),
5 deletions(-)
M
util/epist/config.cc
→
util/epist/config.cc
@@ -35,13 +35,16 @@ items.clear();
} -const string &Config::getStringValue(Config::ItemType type) const +bool Config::getStringValue(Config::ItemType type, string &ret) const { ItemList::const_iterator it = items.begin(), end = items.end(); for (; it != end; ++it) { - if ((*it)->getType() == type) - return (*it)->getStringValue(); + if ((*it)->getType() == type) { + ret = (*it)->getStringValue(); + return true; + } } + return false; }@@ -52,7 +55,6 @@ for (; it != end; ++it) {
if ((*it)->getType() == type) return (*it)->getNumberValue(); } - return 0; }
M
util/epist/config.hh
→
util/epist/config.hh
@@ -45,7 +45,7 @@ public:
Config(); ~Config(); - const std::string &getStringValue(Config::ItemType) const; + bool getStringValue(Config::ItemType, std::string &) const; int getNumberValue(Config::ItemType) const; void addOption(ConfigItem *); void addOption(const std::string &, const std::string &);