summaryrefslogtreecommitdiff
path: root/libcurl
diff options
context:
space:
mode:
authorB Stack <bgstack15@gmail.com>2020-10-03 01:04:14 +0000
committerB Stack <bgstack15@gmail.com>2020-10-03 01:04:14 +0000
commit0576c1a2ab5ff534348c879ea03bb9c9d9f7ac4c (patch)
treed8a89392817379e3036c42eedebf33d4fb372dfd /libcurl
parentMerge branch '11.1' into 'master' (diff)
parentadd upstream 11.2 (diff)
downloadFreeFileSync-0576c1a2ab5ff534348c879ea03bb9c9d9f7ac4c.tar.gz
FreeFileSync-0576c1a2ab5ff534348c879ea03bb9c9d9f7ac4c.tar.bz2
FreeFileSync-0576c1a2ab5ff534348c879ea03bb9c9d9f7ac4c.zip
Merge branch '11.2' into 'master'11.2
add upstream 11.2 See merge request opensource-tracking/FreeFileSync!26
Diffstat (limited to 'libcurl')
-rw-r--r--libcurl/curl_wrap.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/libcurl/curl_wrap.h b/libcurl/curl_wrap.h
index 40a330ef..bc924713 100644
--- a/libcurl/curl_wrap.h
+++ b/libcurl/curl_wrap.h
@@ -148,12 +148,10 @@ std::wstring formatCurlStatusCode(CURLcode sc)
void applyCurlOptions(CURL* easyHandle, const std::vector<CurlOption>& options) //throw SysError
{
for (const CurlOption& opt : options)
- {
- const CURLcode rc = ::curl_easy_setopt(easyHandle, opt.option, opt.value);
- if (rc != CURLE_OK)
+ if (const CURLcode rc = ::curl_easy_setopt(easyHandle, opt.option, opt.value);
+ rc != CURLE_OK)
throw SysError(formatSystemError("curl_easy_setopt(" + numberTo<std::string>(static_cast<int>(opt.option)) + ")",
formatCurlStatusCode(rc), utfTo<std::wstring>(::curl_easy_strerror(rc))));
- }
}
}
}
bgstack15