diff options
| author | Caolán McNamara <caolan.mcnamara@collabora.com> | 2024-06-19 10:23:17 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2024-06-19 11:44:09 +0200 |
| commit | 82a4154eca0527c7b541eb8ed6335f47ba892a46 (patch) | |
| tree | 8a7c1c98685c41616bde0d9623a83ab951680209 | |
| parent | a591835c19dbbad56266946c15bea845812eafd8 (diff) | |
fix apparent mismerge of InitCurl_easy changes
Change-Id: I9bd3c1b15c1e87e9b91a555a1e8a1bfd30a6f2de
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/169189
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
| -rw-r--r-- | include/systools/curlinit.hxx | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/include/systools/curlinit.hxx b/include/systools/curlinit.hxx index b47fa4e51bb6..b6ada72105a3 100644 --- a/include/systools/curlinit.hxx +++ b/include/systools/curlinit.hxx @@ -15,6 +15,7 @@ #include <com/sun/star/uno/RuntimeException.hpp> #include "opensslinit.hxx" +#endif #include <rtl/string.hxx> #include <sal/log.hxx> @@ -23,12 +24,17 @@ static void InitCurl_easy(CURL* const pCURL) { + CURLcode rc; + (void)rc; + +#if defined(LINUX) && !defined(SYSTEM_CURL) char const* const path = GetCABundleFile(); - auto rc = curl_easy_setopt(pCURL, CURLOPT_CAINFO, path); + rc = curl_easy_setopt(pCURL, CURLOPT_CAINFO, path); if (rc != CURLE_OK) // only if OOM? { throw css::uno::RuntimeException("CURLOPT_CAINFO failed"); } +#endif curl_version_info_data const* const pVersion(curl_version_info(CURLVERSION_NOW)); assert(pVersion); @@ -50,13 +56,4 @@ static void InitCurl_easy(CURL* const pCURL) assert(rc == CURLE_OK); } -#else - -static void InitCurl_easy(CURL* const) -{ - // these don't use OpenSSL so CAs work out of the box -} - -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ |