diff --git a/libmamba/include/mamba/core/util.hpp b/libmamba/include/mamba/core/util.hpp index 3cb86083b5..8d81cf65d8 100644 --- a/libmamba/include/mamba/core/util.hpp +++ b/libmamba/include/mamba/core/util.hpp @@ -331,7 +331,7 @@ namespace mamba std::optional proxy_match(const std::string& url); - std::string hide_secrets(const std::string_view& str); + std::string hide_secrets(const std::string_view str); class non_copyable_base { diff --git a/libmamba/src/core/curl.cpp b/libmamba/src/core/curl.cpp index fa5fa8eb1a..0c837450e5 100644 --- a/libmamba/src/core/curl.cpp +++ b/libmamba/src/core/curl.cpp @@ -16,13 +16,13 @@ namespace mamba { namespace curl { - void set_curl_handle( + void configure_curl_handle( CURL* handle, const std::string& url, const bool set_low_speed_opt, - const long& connect_timeout_secs, + const long connect_timeout_secs, const bool ssl_no_revoke, - const std::optional proxy, + const std::optional& proxy, const std::string& ssl_verify ) { diff --git a/libmamba/src/core/curl.hpp b/libmamba/src/core/curl.hpp index 2ba5df5c2c..63b365c5bb 100644 --- a/libmamba/src/core/curl.hpp +++ b/libmamba/src/core/curl.hpp @@ -25,13 +25,13 @@ namespace mamba { namespace curl { - void set_curl_handle( + void configure_curl_handle( CURL* handle, const std::string& url, const bool set_low_speed_opt, - const long& connect_timeout_secs, + const long connect_timeout_secs, const bool ssl_no_revoke, - const std::optional proxy, + const std::optional& proxy, const std::string& ssl_verify ); } diff --git a/libmamba/src/core/fetch.cpp b/libmamba/src/core/fetch.cpp index 9ffc55a745..8cc0df7211 100644 --- a/libmamba/src/core/fetch.cpp +++ b/libmamba/src/core/fetch.cpp @@ -58,7 +58,7 @@ namespace mamba : "0"; bool set_ssl_no_revoke = (Context::instance().ssl_no_revoke || ssl_no_revoke_env != "0"); - curl::set_curl_handle( + curl::configure_curl_handle( handle, url, (no_low_speed_limit == "0"), diff --git a/libmamba/src/core/util.cpp b/libmamba/src/core/util.cpp index c8448311a8..2945bc2779 100644 --- a/libmamba/src/core/util.cpp +++ b/libmamba/src/core/util.cpp @@ -1553,7 +1553,7 @@ namespace mamba return std::nullopt; } - std::string hide_secrets(const std::string_view& str) + std::string hide_secrets(const std::string_view str) { std::string copy(str);