Formatting fixes

rouault · Jan 9, 2025 · cb98cb0 · cb98cb0
1 parent 081d12a
commit cb98cb0
Show file tree

Hide file tree

Showing 4 changed files with 634 additions and 139 deletions.
diff --git a/src/filemanager.cpp b/src/filemanager.cpp
@@ -1985,12 +1985,11 @@ void pj_load_ini(PJ_CONTEXT *ctx) {
     }
 
     const char *native_ca = getenv("PROJ_NATIVE_CA");
-    if (native_ca && native_ca[0] != '\0'){
+    if (native_ca && native_ca[0] != '\0') {
         ctx->native_ca = ci_equal(native_ca, "ON") ||
-                        ci_equal(native_ca, "YES") ||
-                        ci_equal(native_ca, "TRUE");
-    }
-    else {
+                         ci_equal(native_ca, "YES") ||
+                         ci_equal(native_ca, "TRUE");
+    } else {
         native_ca = nullptr;
     }
 
@@ -2059,11 +2058,10 @@ void pj_load_ini(PJ_CONTEXT *ctx) {
                 ctx->errorIfBestTransformationNotAvailableDefault =
                     ci_equal(value, "ON") || ci_equal(value, "YES") ||
                     ci_equal(value, "TRUE");
-            }
-            else if (native_ca == nullptr && key == "native_ca"){
-                ctx->native_ca =
-                    ci_equal(value, "ON") || ci_equal(value, "YES") ||
-                    ci_equal(value, "TRUE");
+            } else if (native_ca == nullptr && key == "native_ca") {
+                ctx->native_ca = ci_equal(value, "ON") ||
+                                 ci_equal(value, "YES") ||
+                                 ci_equal(value, "TRUE");
             }
         }
 

diff --git a/src/networkfilemanager.cpp b/src/networkfilemanager.cpp
@@ -1637,7 +1637,7 @@ CurlFileHandle::CurlFileHandle(PJ_CONTEXT *ctx, const char *url, CURL *handle)
     CHECK_RET(ctx, curl_easy_setopt(handle, CURLOPT_SSL_OPTIONS, ssl_options));
 #else
 #if CURL_AT_LEAST_VERSION(7, 71, 0)
-    if (pj_context_get_native_ca(ctx)){
+    if (pj_context_get_native_ca(ctx)) {
         CHECK_RET(ctx, curl_easy_setopt(handle, CURLOPT_SSL_OPTIONS,
                                         (long)CURLSSLOPT_NATIVE_CA));
     }

diff --git a/src/proj_internal.h b/src/proj_internal.h
@@ -820,7 +820,7 @@ struct pj_ctx {
     std::string endpoint{};
     projNetworkCallbacksAndData networking{};
     std::string ca_bundle_path{};
-    bool native_ca=false;
+    bool native_ca = false;
     projGridChunkCache gridChunkCache{};
     TMercAlgo defaultTmercAlgo =
         TMercAlgo::PODER_ENGSAGER; // can be overridden by content of proj.ini