From 1d5194a13888d76e4bfa859e4b7ea5994a40d400 Mon Sep 17 00:00:00 2001 From: hagen Date: Mon, 18 Jan 2016 00:00:00 +0000 Subject: [PATCH] * drop mapMultiArgs : it's not used anywhere --- Daemon.cpp | 2 +- util.cpp | 7 +------ util.h | 4 +--- 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/Daemon.cpp b/Daemon.cpp index 48ef1e82..d947bbb0 100644 --- a/Daemon.cpp +++ b/Daemon.cpp @@ -65,7 +65,7 @@ namespace i2p LogPrint(eLogInfo, "i2pd v", VERSION, " starting"); LogPrint(eLogDebug, "FS: data directory: ", i2p::util::filesystem::GetDataDir().string()); - i2p::util::filesystem::ReadConfigFile(i2p::util::config::mapArgs, i2p::util::config::mapMultiArgs); + i2p::util::filesystem::ReadConfigFile(i2p::util::config::mapArgs); isDaemon = i2p::util::config::GetArg("-daemon", 0); isLogging = i2p::util::config::GetArg("-log", 1); diff --git a/util.cpp b/util.cpp index afb1d92b..850dfa89 100644 --- a/util.cpp +++ b/util.cpp @@ -70,12 +70,10 @@ namespace util namespace config { std::map mapArgs; - std::map > mapMultiArgs; void OptionParser(int argc, const char* const argv[]) { mapArgs.clear(); - mapMultiArgs.clear(); for (int i = 1; i < argc; i++) { std::string strKey (argv[i]); @@ -96,7 +94,6 @@ namespace config break; mapArgs[strKey] = strValue; - mapMultiArgs[strKey].push_back(strValue); } BOOST_FOREACH(PAIRTYPE(const std::string,std::string)& entry, mapArgs) @@ -196,8 +193,7 @@ namespace filesystem return pathTunnelsConfigFile; } - void ReadConfigFile(std::map& mapSettingsRet, - std::map >& mapMultiSettingsRet) + void ReadConfigFile(std::map& mapSettingsRet) { boost::filesystem::ifstream streamConfig(GetConfigFile()); if (!streamConfig.good()) @@ -214,7 +210,6 @@ namespace filesystem { mapSettingsRet[strKey] = it->value[0]; } - mapMultiSettingsRet[strKey].push_back(it->value[0]); } } diff --git a/util.h b/util.h index 8c72a97b..6478f894 100644 --- a/util.h +++ b/util.h @@ -17,7 +17,6 @@ namespace util namespace config { extern std::map mapArgs; - extern std::map > mapMultiArgs; void OptionParser(int argc, const char* const argv[]); int GetArg(const std::string& strArg, int nDefault); std::string GetArg(const std::string& strArg, const std::string& strDefault); @@ -34,8 +33,7 @@ namespace util boost::filesystem::path GetDefaultDataDir(); boost::filesystem::path GetConfigFile(); boost::filesystem::path GetTunnelsConfigFile(); - void ReadConfigFile(std::map& mapSettingsRet, - std::map >& mapMultiSettingsRet); + void ReadConfigFile(std::map& mapSettingsRet); boost::filesystem::path GetCertificatesDir(); }