diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/filemanager.cpp | 3 | ||||
| -rw-r--r-- | src/iso19111/c_api.cpp | 16 | ||||
| -rw-r--r-- | src/networkfilemanager.cpp | 12 |
3 files changed, 15 insertions, 16 deletions
diff --git a/src/filemanager.cpp b/src/filemanager.cpp index db0aa2ee..e6a9ed95 100644 --- a/src/filemanager.cpp +++ b/src/filemanager.cpp @@ -1986,7 +1986,6 @@ void pj_set_searchpath(int count, const char **path) { const_cast<const char *const *>(path)); } - /************************************************************************/ /* proj_context_set_ca_bundle_path() */ /************************************************************************/ @@ -2012,7 +2011,7 @@ void proj_context_set_ca_bundle_path(PJ_CONTEXT *ctx, const char *path) { if (!ctx) return; try { - ctx->set_ca_bundle_path(path != nullptr ? path : ""); + ctx->set_ca_bundle_path(path != nullptr ? path : ""); } catch (const std::exception &) { } } diff --git a/src/iso19111/c_api.cpp b/src/iso19111/c_api.cpp index 6e07e54c..2e968985 100644 --- a/src/iso19111/c_api.cpp +++ b/src/iso19111/c_api.cpp @@ -125,12 +125,9 @@ projCppContext::toVector(const char *const *auxDbPaths) { // --------------------------------------------------------------------------- -projCppContext* projCppContext::clone(PJ_CONTEXT *ctx) const { - projCppContext* newContext = new projCppContext( - ctx, - getDbPath().c_str(), - getAuxDbPaths() - ); +projCppContext *projCppContext::clone(PJ_CONTEXT *ctx) const { + projCppContext *newContext = + new projCppContext(ctx, getDbPath().c_str(), getAuxDbPaths()); newContext->setAutoCloseDb(getAutoCloseDb()); return newContext; } @@ -815,8 +812,8 @@ int PROJ_DLL proj_grid_get_info_from_database( if (!db_context->lookForGridInfo( grid_name, false, ctx->get_cpp_context()->lastGridFullName_, ctx->get_cpp_context()->lastGridPackageName_, - ctx->get_cpp_context()->lastGridUrl_, direct_download, open_license, - available)) { + ctx->get_cpp_context()->lastGridUrl_, direct_download, + open_license, available)) { ctx->safeAutoCloseDbIfNeeded(); return false; } @@ -824,7 +821,8 @@ int PROJ_DLL proj_grid_get_info_from_database( if (out_full_name) *out_full_name = ctx->get_cpp_context()->lastGridFullName_.c_str(); if (out_package_name) - *out_package_name = ctx->get_cpp_context()->lastGridPackageName_.c_str(); + *out_package_name = + ctx->get_cpp_context()->lastGridPackageName_.c_str(); if (out_url) *out_url = ctx->get_cpp_context()->lastGridUrl_.c_str(); if (out_direct_download) diff --git a/src/networkfilemanager.cpp b/src/networkfilemanager.cpp index 7587bb72..f6521ed2 100644 --- a/src/networkfilemanager.cpp +++ b/src/networkfilemanager.cpp @@ -1522,7 +1522,8 @@ struct CurlFileHandle { CurlFileHandle(const CurlFileHandle &) = delete; CurlFileHandle &operator=(const CurlFileHandle &) = delete; - explicit CurlFileHandle(const char *url, CURL *handle, const char *ca_bundle_path); + explicit CurlFileHandle(const char *url, CURL *handle, + const char *ca_bundle_path); ~CurlFileHandle(); static PROJ_NETWORK_HANDLE * @@ -1594,7 +1595,8 @@ static std::string GetExecutableName() { // --------------------------------------------------------------------------- -CurlFileHandle::CurlFileHandle(const char *url, CURL *handle, const char *ca_bundle_path) +CurlFileHandle::CurlFileHandle(const char *url, CURL *handle, + const char *ca_bundle_path) : m_url(url), m_handle(handle) { curl_easy_setopt(handle, CURLOPT_URL, m_url.c_str()); @@ -1699,9 +1701,9 @@ PROJ_NETWORK_HANDLE *CurlFileHandle::open(PJ_CONTEXT *ctx, const char *url, if (!hCurlHandle) return nullptr; - auto file = - std::unique_ptr<CurlFileHandle>(new CurlFileHandle( - url, hCurlHandle, ctx->ca_bundle_path.empty() ? nullptr : ctx->ca_bundle_path.c_str())); + auto file = std::unique_ptr<CurlFileHandle>(new CurlFileHandle( + url, hCurlHandle, + ctx->ca_bundle_path.empty() ? nullptr : ctx->ca_bundle_path.c_str())); double oldDelay = MIN_RETRY_DELAY_MS; std::string headers; |