Merge remote-tracking branch 'osgeo/master'

1 files changed, 12 insertions, 10 deletions

diff --git a/src/datum_set.cpp b/src/datum_set.cpp
index 15d51613..3f612633 100644
--- a/src/datum_set.cpp
+++ b/src/datum_set.cpp
@@ -38,7 +38,7 @@
 /*                            pj_datum_set()                            */
 /************************************************************************/
 
-int pj_datum_set(projCtx ctx, paralist *pl, PJ *projdef)
+int pj_datum_set(PJ_CONTEXT *ctx, paralist *pl, PJ *projdef)
 
 {
     const char *name, *towgs84, *nadgrids;
@@ -71,7 +71,7 @@ int pj_datum_set(projCtx ctx, paralist *pl, PJ *projdef)
         for (i = 0; (s = pj_datums[i].id) && strcmp(name, s) ; ++i) {}
 
         if (!s) {
-            pj_ctx_set_errno(ctx, PJD_ERR_UNKNOWN_ELLP_PARAM);
+            proj_context_errno_set(ctx, PJD_ERR_UNKNOWN_ELLP_PARAM);
             return 1;
         }
 
@@ -84,25 +84,27 @@ int pj_datum_set(projCtx ctx, paralist *pl, PJ *projdef)
                      sizeof(entry) - 1 - strlen(entry) );
             entry[ sizeof(entry) - 1 ] = '\0';
 
-            curr = curr->next = pj_mkparam(entry);
-            if (nullptr == curr)
+            auto param = pj_mkparam(entry);
+            if (nullptr == param)
             {
-                pj_ctx_set_errno(ctx, ENOMEM);
+                proj_context_errno_set(ctx, ENOMEM);
                 return 1;
             }
+            curr->next = param;
+            curr = param;
         }
         
         if( pj_datums[i].defn && strlen(pj_datums[i].defn) > 0 )
         {
-            curr = curr->next = pj_mkparam(pj_datums[i].defn);
-            if (nullptr == curr)
+            auto param = pj_mkparam(pj_datums[i].defn);
+            if (nullptr == param)
             {
-                pj_ctx_set_errno(ctx, ENOMEM);
+                proj_context_errno_set(ctx, ENOMEM);
                 return 1;
             }
+            curr->next = param;
+            /* curr = param; */
         }
-
-        (void)curr; /* make clang static analyzer happy */
     }
 
 /* -------------------------------------------------------------------- */