diff --git a/daemon/src/config/config.cpp b/daemon/src/config/config.cpp
index c3dd1ff67aa4747ca4b0a9a7139109252731f414..d96d14dfc4b85b356293f23ccecfb88c1448d8df 100644
--- a/daemon/src/config/config.cpp
+++ b/daemon/src/config/config.cpp
@@ -42,19 +42,12 @@
namespace Conf {
-// ctor
-ConfigTree::ConfigTree() :_sections()
-{
-}
-
-// dtor
ConfigTree::~ConfigTree()
{
-
// erase every new ItemMap (by CreateSection)
- SectionMap::iterator iter = _sections.begin();
+ SectionMap::iterator iter = sections_.begin();
- while (iter != _sections.end()) {
+ while (iter != sections_.end()) {
delete iter->second;
iter->second = NULL;
iter++;
@@ -63,19 +56,18 @@ ConfigTree::~ConfigTree()
void ConfigTree::addDefaultValue(const std::pair<std::string, std::string>& token, std::string section)
{
- _defaultValueMap.insert(token);
+ defaultValueMap_.insert(token);
- if (section.empty() == false) {
+ if (not section.empty())
addConfigTreeItem(section, ConfigTreeItem(token.first, token.second, token.second, "string"));
- }
}
std::string ConfigTree::getDefaultValue(const std::string& key) const
{
std::map<std::string, std::string>::const_iterator it;
- it = _defaultValueMap.find(key);
+ it = defaultValueMap_.find(key);
- if (it == _defaultValueMap.end())
+ if (it == defaultValueMap_.end())
return "";
return it->second;
@@ -88,9 +80,8 @@ void
ConfigTree::createSection(const std::string& section)
{
// if we doesn't find the item, create it
- if (_sections.find(section) == _sections.end()) {
- _sections[section] = new ItemMap;
- }
+ if (sections_.find(section) == sections_.end())
+ sections_[section] = new ItemMap;
}
/**
@@ -100,11 +91,10 @@ void
ConfigTree::removeSection(const std::string& section)
{
// if we doesn't find the item, create it
- SectionMap::iterator iter = _sections.find(section);
+ SectionMap::iterator iter = sections_.find(section);
- if (iter != _sections.end()) {
- _sections.erase(iter);
- }
+ if (iter != sections_.end())
+ sections_.erase(iter);
}
/** Retrieve the sections as an array */
@@ -113,9 +103,9 @@ ConfigTree::getSections()
{
TokenList sections;
- SectionMap::iterator iter = _sections.begin();
+ SectionMap::iterator iter = sections_.begin();
- while (iter != _sections.end()) {
+ while (iter != sections_.end()) {
// add to token list the: iter->second;
sections.push_back(iter->first);
iter++;
@@ -132,16 +122,16 @@ void
ConfigTree::addConfigTreeItem(const std::string& section, const ConfigTreeItem item)
{
// if we doesn't find the item, create it
- SectionMap::iterator iter = _sections.find(section);
+ SectionMap::iterator iter = sections_.find(section);
- if (iter == _sections.end()) {
- _sections[section] = new ItemMap;
- iter = _sections.find(section);
+ if (iter == sections_.end()) {
+ sections_[section] = new ItemMap;
+ iter = sections_.find(section);
}
// be prudent here
- if (iter != _sections.end()) {
- std::string name = item.getName();
+ if (iter != sections_.end()) {
+ std::string name(item.getName());
if (iter->second->find(name) == iter->second->end()) {
(*(iter->second))[name] = item;
@@ -206,9 +196,9 @@ ConfigTree::getConfigTreeItemToken(const std::string& section, const std::string
const ConfigTreeItem*
ConfigTree::getConfigTreeItem(const std::string& section, const std::string& itemName) const
{
- SectionMap::const_iterator iter = _sections.find(section);
+ SectionMap::const_iterator iter = sections_.find(section);
- if (iter == _sections.end())
+ if (iter == sections_.end())
return NULL;
ItemMap::const_iterator iterItem = iter->second->find(itemName);
@@ -231,12 +221,12 @@ ConfigTree::setConfigTreeItem(const std::string& section,
const std::string& value)
{
- SectionMap::iterator iter = _sections.find(section);
+ SectionMap::iterator iter = sections_.find(section);
- if (iter == _sections.end()) {
+ if (iter == sections_.end()) {
// Not found, create section
- _sections[section] = new ItemMap;
- iter = _sections.find(section);
+ sections_[section] = new ItemMap;
+ iter = sections_.find(section);
}
ItemMap::iterator iterItem = iter->second->find(itemName);
@@ -268,9 +258,8 @@ ConfigTree::saveConfigTree(const std::string& fileName)
{
_debug("ConfigTree: Save %s", fileName.c_str());
- if (fileName.empty() && _sections.begin() == _sections.end()) {
+ if (fileName.empty() and sections_.begin() == sections_.end())
return false;
- }
std::fstream file;
@@ -282,9 +271,9 @@ ConfigTree::saveConfigTree(const std::string& fileName)
}
// for each section, for each item...
- SectionMap::iterator iter = _sections.begin();
+ SectionMap::iterator iter = sections_.begin();
- while (iter != _sections.end()) {
+ while (iter != sections_.end()) {
file << "[" << iter->first << "]" << std::endl;
ItemMap::iterator iterItem = iter->second->begin();
@@ -300,9 +289,8 @@ ConfigTree::saveConfigTree(const std::string& fileName)
file.close();
- if (chmod(fileName.c_str(), S_IRUSR | S_IWUSR)) {
+ if (chmod(fileName.c_str(), S_IRUSR | S_IWUSR))
_error("ConfigTree: Error: Failed to set permission on configuration: %m");
- }
return true;
}
@@ -316,9 +304,8 @@ ConfigTree::populateFromFile(const std::string& fileName)
{
_debug("ConfigTree: Populate from file %s", fileName.c_str());
- if (fileName.empty()) {
+ if (fileName.empty())
return 0;
- }
std::fstream file;
@@ -327,9 +314,8 @@ ConfigTree::populateFromFile(const std::string& fileName)
if (!file.is_open()) {
file.open(fileName.data(), std::fstream::out);
- if (!file.is_open()) {
+ if (!file.is_open())
return 0;
- }
file.close();
@@ -371,28 +357,16 @@ ConfigTree::populateFromFile(const std::string& fileName)
key = line.substr(0, pos);
val = line.substr(pos + 1, line.length() - pos);
- if (key.length() > 0 && val.length() > 0) {
+ if (key.length() > 0 && val.length() > 0)
setConfigTreeItem(section, key, val);
- }
-
- /*
- if (key.length() > 0) {
-
- if(val.length() > 0)
- setConfigTreeItem (section, key, val);
- else
- setConfigTreeItem (section, key, "");
- }
- */
}
}
}
file.close();
- if (chmod(fileName.c_str(), S_IRUSR | S_IWUSR)) {
+ if (chmod(fileName.c_str(), S_IRUSR | S_IWUSR))
_debug("Failed to set permission on configuration file because: %m");
- }
return 1;
}
@@ -401,17 +375,17 @@ TokenList
ConfigTreeIterator::begin()
{
TokenList tk;
- _iter = _tree->_sections.begin();
+ iter_ = tree_->sections_.begin();
- if (_iter!=_tree->_sections.end()) {
- _iterItem = _iter->second->begin();
+ if (iter_!=tree_->sections_.end()) {
+ iterItem_ = iter_->second->begin();
- if (_iterItem!=_iter->second->end()) {
- tk.push_back(_iter->first);
- tk.push_back(_iterItem->first);
- tk.push_back(_iterItem->second.getType());
- tk.push_back(_iterItem->second.getValue());
- tk.push_back(_iterItem->second.getDefaultValue());
+ if (iterItem_!=iter_->second->end()) {
+ tk.push_back(iter_->first);
+ tk.push_back(iterItem_->first);
+ tk.push_back(iterItem_->second.getType());
+ tk.push_back(iterItem_->second.getValue());
+ tk.push_back(iterItem_->second.getDefaultValue());
}
}
@@ -424,39 +398,36 @@ ConfigTreeIterator::next()
TokenList tk;
// we return tk empty if we are at the end of the list...
- if (_iter==_tree->_sections.end()) {
+ if (iter_ == tree_->sections_.end())
return tk;
- }
- if (_iterItem!=_iter->second->end()) {
- _iterItem++;
- }
+ if (iterItem_ != iter_->second->end())
+ iterItem_++;
- if (_iterItem==_iter->second->end()) {
+ if (iterItem_ == iter_->second->end()) {
// if we increment, and we are at the end of a section
- _iter++;
+ iter_++;
- if (_iter!=_tree->_sections.end()) {
- _iterItem = _iter->second->begin();
+ if (iter_ != tree_->sections_.end()) {
+ iterItem_ = iter_->second->begin();
- if (_iterItem!=_iter->second->end()) {
- tk.push_back(_iter->first);
- tk.push_back(_iterItem->first);
- tk.push_back(_iterItem->second.getType());
- tk.push_back(_iterItem->second.getValue());
- tk.push_back(_iterItem->second.getDefaultValue());
+ if (iterItem_ != iter_->second->end()) {
+ tk.push_back(iter_->first);
+ tk.push_back(iterItem_->first);
+ tk.push_back(iterItem_->second.getType());
+ tk.push_back(iterItem_->second.getValue());
+ tk.push_back(iterItem_->second.getDefaultValue());
}
}
} else {
- tk.push_back(_iter->first);
- tk.push_back(_iterItem->first);
- tk.push_back(_iterItem->second.getType());
- tk.push_back(_iterItem->second.getValue());
- tk.push_back(_iterItem->second.getDefaultValue());
+ tk.push_back(iter_->first);
+ tk.push_back(iterItem_->first);
+ tk.push_back(iterItem_->second.getType());
+ tk.push_back(iterItem_->second.getValue());
+ tk.push_back(iterItem_->second.getDefaultValue());
}
return tk;
}
} // end namespace ConfigTree
-
diff --git a/daemon/src/config/config.h b/daemon/src/config/config.h
index 84c9ed5f9baeef3f2096483044d2ba8dd2a1e972..05ea82176b270ff0b5a5a74459a716c151118bd8 100644
--- a/daemon/src/config/config.h
+++ b/daemon/src/config/config.h
@@ -29,8 +29,8 @@
* as that of the covered work.
*/
-#ifndef __CONFIG_CONFIG_H_
-#define __CONFIG_CONFIG_H_
+#ifndef __CONF_CONFIG_H__
+#define __CONF_CONFIG_H__
#include <map>
#include <string>
@@ -50,17 +50,6 @@ typedef std::map<std::string, ItemMap*> SectionMap;
typedef std::list<std::string> TokenList;
class ConfigTreeItemException {
-
- public:
- /**
- * Constructor
- * */
- ConfigTreeItemException() {}
-
- /**
- * Destructor
- * */
- ~ConfigTreeItemException() {}
};
class ConfigTree;
@@ -79,7 +68,7 @@ class ConfigTreeIterator {
* @return TokenList
*/
const TokenList& end() const {
- return _endToken;
+ return endToken_;
}
/**
@@ -89,23 +78,21 @@ class ConfigTreeIterator {
TokenList next();
private:
-
friend class ConfigTree;
- ConfigTreeIterator(ConfigTree *configTree) : _tree(configTree), _endToken(), _iter(), _iterItem() {}
+ ConfigTreeIterator(ConfigTree *configTree) : tree_(configTree), endToken_(), iter_(), iterItem_() {}
ConfigTreeIterator(const Conf::ConfigTreeIterator&);
ConfigTreeIterator& operator= (const Conf::ConfigTreeIterator&);
- ConfigTree* _tree;
- TokenList _endToken;
- SectionMap::iterator _iter;
- ItemMap::iterator _iterItem;
+ ConfigTree* tree_;
+ TokenList endToken_;
+ SectionMap::iterator iter_;
+ ItemMap::iterator iterItem_;
};
class ConfigTree {
-
public:
- ConfigTree();
+ ConfigTree() {}
~ConfigTree();
/**
* Add a default value for a given key.
@@ -119,7 +106,7 @@ class ConfigTree {
value for a given key.
@param token A default key/value pair.
*/
- void addDefaultValue(const std::pair<std::string, std::string>& token, std::string section = std::string(""));
+ void addDefaultValue(const std::pair<std::string, std::string>& token, std::string section = "");
void createSection(const std::string& section);
void removeSection(const std::string& section);
@@ -178,12 +165,15 @@ class ConfigTree {
/**
* List of sections. Each sections has an ItemList as child
*/
- SectionMap _sections;
+ SectionMap sections_;
- std::map<std::string, std::string> _defaultValueMap;
+ std::map<std::string, std::string> defaultValueMap_;
friend class ConfigTreeIterator;
+ // noncopyable
+ ConfigTree(const ConfigTree &other);
+ ConfigTree& operator=(const ConfigTree &other);
public:
ConfigTreeIterator createIterator() {
return ConfigTreeIterator(this);
@@ -193,46 +183,44 @@ class ConfigTree {
class ConfigTreeItem {
public:
- ConfigTreeItem() : _name(""), _value(""), _defaultValue(""), _type("string") {}
+ ConfigTreeItem() : name_(""), value_(""), defaultValue_(""), type_("string") {}
// defaultvalue = value
ConfigTreeItem(const std::string& name, const std::string& value, const std::string& type) :
- _name(name), _value(value),
- _defaultValue(value), _type(type) {}
+ name_(name), value_(value),
+ defaultValue_(value), type_(type) {}
ConfigTreeItem(const std::string& name, const std::string& value, const std::string& defaultValue, const std::string& type) :
- _name(name), _value(value),
- _defaultValue(defaultValue), _type(type) {}
-
- ~ConfigTreeItem() {}
+ name_(name), value_(value),
+ defaultValue_(defaultValue), type_(type) {}
void setValue(const std::string& value) {
- _value = value;
+ value_ = value;
}
const std::string getName() const {
- return _name;
+ return name_;
}
const std::string getValue() const {
- return _value;
+ return value_;
}
const std::string getDefaultValue() const {
- return _defaultValue;
+ return defaultValue_;
}
const std::string getType() const {
- return _type;
+ return type_;
}
private:
- std::string _name;
- std::string _value;
- std::string _defaultValue;
- std::string _type;
+ std::string name_;
+ std::string value_;
+ std::string defaultValue_;
+ std::string type_;
};
} // end namespace ConfigTree
-#endif
+#endif // __CONFIG_CONFIG_H__
diff --git a/daemon/src/history/historymanager.cpp b/daemon/src/history/historymanager.cpp
index 6c1d284972b42670d1d86519a069f231a28fab12..e82d8d1f92e2a262e96fc3d34a6a7ccdbf6bbd44 100644
--- a/daemon/src/history/historymanager.cpp
+++ b/daemon/src/history/historymanager.cpp
@@ -81,11 +81,9 @@ bool HistoryManager::save_history(void)
bool HistoryManager::load_history_from_file(Conf::ConfigTree *history_list)
{
- int exist;
-
_debug("HistoryManager: Load history from file %s", _history_path.c_str());
- exist = history_list->populateFromFile(_history_path.c_str());
+ int exist = history_list->populateFromFile(_history_path.c_str());
_history_loaded = (exist == 2) ? false : true;
return _history_loaded;