diff options
| author | Max Kellermann <max@duempel.org> | 2015-01-21 22:36:13 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2015-01-21 23:30:00 +0100 |
| commit | 1c3f5517fabc264d7b37935bd37197cdd68250ba (patch) | |
| tree | 509f68fe930e79bfa4c70a1cf2146a347f8acdef /src/input | |
| parent | 10972da06030d57429dc2c86c21e37fd0aca88dc (diff) | |
config/Option: convert to strictly-typed enum
Diffstat (limited to 'src/input')
| -rw-r--r-- | src/input/Init.cxx | 3 | ||||
| -rw-r--r-- | src/input/plugins/CurlInputPlugin.cxx | 8 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/input/Init.cxx b/src/input/Init.cxx index 9fbef934e..0debf6d43 100644 --- a/src/input/Init.cxx +++ b/src/input/Init.cxx @@ -43,7 +43,8 @@ input_stream_global_init(Error &error) assert(plugin->open != nullptr); const struct config_param *param = - config_find_block(CONF_INPUT, "plugin", plugin->name); + config_find_block(ConfigOption::INPUT, "plugin", + plugin->name); if (param == nullptr) { param = ∅ } else if (!param->GetBlockValue("enabled", true)) diff --git a/src/input/plugins/CurlInputPlugin.cxx b/src/input/plugins/CurlInputPlugin.cxx index 114f03f3c..bdfcaf647 100644 --- a/src/input/plugins/CurlInputPlugin.cxx +++ b/src/input/plugins/CurlInputPlugin.cxx @@ -564,10 +564,10 @@ input_curl_init(const config_param ¶m, Error &error) if (proxy == nullptr) { /* deprecated proxy configuration */ - proxy = config_get_string(CONF_HTTP_PROXY_HOST, nullptr); - proxy_port = config_get_positive(CONF_HTTP_PROXY_PORT, 0); - proxy_user = config_get_string(CONF_HTTP_PROXY_USER, nullptr); - proxy_password = config_get_string(CONF_HTTP_PROXY_PASSWORD, + proxy = config_get_string(ConfigOption::HTTP_PROXY_HOST, nullptr); + proxy_port = config_get_positive(ConfigOption::HTTP_PROXY_PORT, 0); + proxy_user = config_get_string(ConfigOption::HTTP_PROXY_USER, nullptr); + proxy_password = config_get_string(ConfigOption::HTTP_PROXY_PASSWORD, ""); } |