diff options
author | Henning Baldersheim <balder@oath.com> | 2018-08-10 23:36:02 +0200 |
---|---|---|
committer | Henning Baldersheim <balder@oath.com> | 2018-08-10 23:36:02 +0200 |
commit | c30c4660caf1dbb1bd5f966ee04c9d474cc3eb0c (patch) | |
tree | adca094f2a403b29cbcb7bf8df8616f5aec898e6 /config | |
parent | 822e3e3d0630b3af1d76079da8c3e1d161c3ca1a (diff) |
Pass stringref by value
Diffstat (limited to 'config')
-rw-r--r-- | config/src/vespa/config/common/configkey.cpp | 4 | ||||
-rw-r--r-- | config/src/vespa/config/common/configkey.h | 6 | ||||
-rw-r--r-- | config/src/vespa/config/common/configparser.cpp | 10 | ||||
-rw-r--r-- | config/src/vespa/config/common/configparser.h | 38 |
4 files changed, 29 insertions, 29 deletions
diff --git a/config/src/vespa/config/common/configkey.cpp b/config/src/vespa/config/common/configkey.cpp index 64eefe8339a..a5f8602224c 100644 --- a/config/src/vespa/config/common/configkey.cpp +++ b/config/src/vespa/config/common/configkey.cpp @@ -4,7 +4,7 @@ namespace config { -ConfigKey::ConfigKey(const vespalib::stringref & configId, +ConfigKey::ConfigKey(vespalib::stringref configId, const vespalib::stringref & defName, const vespalib::stringref & defNamespace, const vespalib::stringref & defMd5) @@ -16,7 +16,7 @@ ConfigKey::ConfigKey(const vespalib::stringref & configId, _key(_configId + _defName + _defNamespace) {} -ConfigKey::ConfigKey(const vespalib::stringref & configId, +ConfigKey::ConfigKey(vespalib::stringref configId, const vespalib::stringref & defName, const vespalib::stringref & defNamespace, const vespalib::stringref & defMd5, diff --git a/config/src/vespa/config/common/configkey.h b/config/src/vespa/config/common/configkey.h index 1cde2433281..67e99f1ff47 100644 --- a/config/src/vespa/config/common/configkey.h +++ b/config/src/vespa/config/common/configkey.h @@ -8,12 +8,12 @@ namespace config { class ConfigKey { public: - ConfigKey(const vespalib::stringref & configId, + ConfigKey(vespalib::stringref configId, const vespalib::stringref & defName, const vespalib::stringref & defNamespace, const vespalib::stringref & defMd5); - ConfigKey(const vespalib::stringref & configId, + ConfigKey(vespalib::stringref configId, const vespalib::stringref & defName, const vespalib::stringref & defNamespace, const vespalib::stringref & defMd5, @@ -37,7 +37,7 @@ public: const std::vector<vespalib::string> & getDefSchema() const; template <typename ConfigType> - static const ConfigKey create(const vespalib::stringref & configId) + static const ConfigKey create(vespalib::stringref configId) { return ConfigKey(configId, ConfigType::CONFIG_DEF_NAME, ConfigType::CONFIG_DEF_NAMESPACE, diff --git a/config/src/vespa/config/common/configparser.cpp b/config/src/vespa/config/common/configparser.cpp index 4d9eac41af6..2305f15f46d 100644 --- a/config/src/vespa/config/common/configparser.cpp +++ b/config/src/vespa/config/common/configparser.cpp @@ -8,7 +8,7 @@ namespace config { -void ConfigParser::throwNoDefaultValue(const vespalib::stringref & key) { +void ConfigParser::throwNoDefaultValue(vespalib::stringref key) { throw InvalidConfigException("Config parameter " + key + " has no " "default value and is not specified in config", VESPA_STRLOC); } @@ -85,7 +85,7 @@ ConfigParser::deQuote(const vespalib::string & source) namespace { bool -getValueForKey(const vespalib::stringref & key, const vespalib::stringref & line, +getValueForKey(vespalib::stringref key, const vespalib::stringref & line, vespalib::string& retval) { if (line.length() <= key.length()) { @@ -124,7 +124,7 @@ getValueForKey(const vespalib::stringref & key, const vespalib::stringref & line } std::vector<vespalib::string> -ConfigParser::getLinesForKey(const vespalib::stringref & key, +ConfigParser::getLinesForKey(vespalib::stringref key, const vsvector & lines) { vsvector retval; @@ -141,7 +141,7 @@ ConfigParser::getLinesForKey(const vespalib::stringref & key, } void -ConfigParser::stripLinesForKey(const vespalib::stringref & key, +ConfigParser::stripLinesForKey(vespalib::stringref key, std::set<vespalib::string>& config) { vespalib::string value; @@ -228,7 +228,7 @@ ConfigParser::splitArray(const vsvector & config) } vespalib::string -ConfigParser::stripWhitespace(const vespalib::stringref & source) +ConfigParser::stripWhitespace(vespalib::stringref source) { // Remove leading spaces and return. if (source.empty()) { diff --git a/config/src/vespa/config/common/configparser.h b/config/src/vespa/config/common/configparser.h index 77b5bf7ddaa..608fbcce560 100644 --- a/config/src/vespa/config/common/configparser.h +++ b/config/src/vespa/config/common/configparser.h @@ -18,13 +18,13 @@ class ConfigParser { public: typedef std::vector<vespalib::string> vsvector; private: - static vsvector getLinesForKey( const vespalib::stringref & key, const vsvector & config); + static vsvector getLinesForKey(vespalib::stringref key, const vsvector & config); static std::vector<vsvector> splitArray( const vsvector & config); static std::map<vespalib::string, vsvector> splitMap( const vsvector & config); static vespalib::string deQuote(const vespalib::string & source); - static void throwNoDefaultValue(const vespalib::stringref & key); + static void throwNoDefaultValue(vespalib::stringref key); template<typename T> static T convert(const vsvector &); @@ -32,43 +32,43 @@ private: static vespalib::string arrayToString(const vsvector &); template<typename T, typename V> - static T parseInternal(const vespalib::stringref & key, const V & config); + static T parseInternal(vespalib::stringref key, const V & config); template<typename T, typename V> - static T parseInternal(const vespalib::stringref & key, const V & config, T defaultValue); + static T parseInternal(vespalib::stringref key, const V & config, T defaultValue); template<typename T, typename V> - static std::vector<T> parseArrayInternal(const vespalib::stringref & key, const V & config); + static std::vector<T> parseArrayInternal(vespalib::stringref key, const V & config); template<typename T, typename V> - static std::map<vespalib::string, T> parseMapInternal(const vespalib::stringref & key, const V & config); + static std::map<vespalib::string, T> parseMapInternal(vespalib::stringref key, const V & config); template<typename T, typename V> - static T parseStructInternal(const vespalib::stringref & key, const V & config); + static T parseStructInternal(vespalib::stringref key, const V & config); public: - static void stripLinesForKey(const vespalib::stringref & key, + static void stripLinesForKey(vespalib::stringref key, std::set<vespalib::string>& config); - static vespalib::string stripWhitespace(const vespalib::stringref & source); + static vespalib::string stripWhitespace(vespalib::stringref source); template<typename T> - static T parse(const vespalib::stringref & key, const vsvector & config) { + static T parse(vespalib::stringref key, const vsvector & config) { return parseInternal<T, vsvector>(key, config); } template<typename T> - static T parse(const vespalib::stringref & key, const vsvector & config, T defaultValue) { + static T parse(vespalib::stringref key, const vsvector & config, T defaultValue) { return parseInternal(key, config, defaultValue); } template<typename T> - static std::vector<T> parseArray(const vespalib::stringref & key, const vsvector & config) { + static std::vector<T> parseArray(vespalib::stringref key, const vsvector & config) { return parseArrayInternal<T, vsvector>(key, config); } template<typename T> - static std::map<vespalib::string, T> parseMap(const vespalib::stringref & key, const vsvector & config) { + static std::map<vespalib::string, T> parseMap(vespalib::stringref key, const vsvector & config) { return parseMapInternal<T, vsvector>(key, config); } template<typename T> - static T parseStruct(const vespalib::stringref & key, const vsvector & config) { + static T parseStruct(vespalib::stringref key, const vsvector & config) { return parseStructInternal<T, vsvector>(key, config); } @@ -76,7 +76,7 @@ public: template<typename T, typename V> T -ConfigParser::parseInternal(const vespalib::stringref & key, const V & config) +ConfigParser::parseInternal(vespalib::stringref key, const V & config) { V lines = getLinesForKey(key, config); @@ -88,7 +88,7 @@ ConfigParser::parseInternal(const vespalib::stringref & key, const V & config) template<typename T, typename V> T -ConfigParser::parseInternal(const vespalib::stringref & key, const V & config, T defaultValue) +ConfigParser::parseInternal(vespalib::stringref key, const V & config, T defaultValue) { V lines = getLinesForKey(key, config); @@ -107,7 +107,7 @@ ConfigParser::convert(const vsvector & lines) { template<typename T, typename V> std::map<vespalib::string, T> -ConfigParser::parseMapInternal(const vespalib::stringref & key, const V & config) +ConfigParser::parseMapInternal(vespalib::stringref key, const V & config) { V lines = getLinesForKey(key, config); typedef std::map<vespalib::string, V> SplittedMap; @@ -121,7 +121,7 @@ ConfigParser::parseMapInternal(const vespalib::stringref & key, const V & config template<typename T, typename V> std::vector<T> -ConfigParser::parseArrayInternal(const vespalib::stringref & key, const V & config) +ConfigParser::parseArrayInternal(vespalib::stringref key, const V & config) { V lines = getLinesForKey(key, config); std::vector<V> split = splitArray(lines); @@ -136,7 +136,7 @@ ConfigParser::parseArrayInternal(const vespalib::stringref & key, const V & conf template<typename T, typename V> T -ConfigParser::parseStructInternal(const vespalib::stringref & key, const V & config) +ConfigParser::parseStructInternal(vespalib::stringref key, const V & config) { V lines = getLinesForKey(key, config); |