fixed getStringValue failure case and compiler warnings

diff --git a/util/epist/config.cc b/util/epist/config.cc
index 0df15e9c9ab0e260ad269f1a101c6517f12b855b..506aab76f517ad4a7843b035c222e45dca25114c 100644 (file)
--- a/util/epist/config.cc
+++ b/util/epist/config.cc
@@ -35,13 +35,16 @@ Config::~Config()
 }
 
 
-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 @@ int Config::getNumberValue(Config::ItemType type) const
     if ((*it)->getType() == type)
       return (*it)->getNumberValue();
   }
-
   return 0;
 }
 

diff --git a/util/epist/config.hh b/util/epist/config.hh
index 1732012510c465fa7b055bb29c1da9f7032abe9a..443834edf8eff918bb3b494f3c648316e32a2035 100644 (file)
--- a/util/epist/config.hh
+++ b/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 &);