From aa46197d66ce70ece382bf955326c46b13f35864 Mon Sep 17 00:00:00 2001 From: Kristian Evers Date: Sat, 14 Nov 2020 22:55:31 +0100 Subject: Weed out proj_api.h datatypes and replace them with their proj.h counterparts --- src/datum_set.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/datum_set.cpp') diff --git a/src/datum_set.cpp b/src/datum_set.cpp index 15d51613..cc6f3dbe 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; -- cgit v1.2.3 From a74b985b5006c2d279353a245cfcb850cf7fcc94 Mon Sep 17 00:00:00 2001 From: Kristian Evers Date: Tue, 17 Nov 2020 12:54:24 +0100 Subject: Remove pj_ctx_* functions and use their proj_context counterparts --- src/datum_set.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/datum_set.cpp') diff --git a/src/datum_set.cpp b/src/datum_set.cpp index cc6f3dbe..398d85cd 100644 --- a/src/datum_set.cpp +++ b/src/datum_set.cpp @@ -71,7 +71,7 @@ int pj_datum_set(PJ_CONTEXT *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; } @@ -87,7 +87,7 @@ int pj_datum_set(PJ_CONTEXT *ctx, paralist *pl, PJ *projdef) curr = curr->next = pj_mkparam(entry); if (nullptr == curr) { - pj_ctx_set_errno(ctx, ENOMEM); + proj_context_errno_set(ctx, ENOMEM); return 1; } } @@ -97,7 +97,7 @@ int pj_datum_set(PJ_CONTEXT *ctx, paralist *pl, PJ *projdef) curr = curr->next = pj_mkparam(pj_datums[i].defn); if (nullptr == curr) { - pj_ctx_set_errno(ctx, ENOMEM); + proj_context_errno_set(ctx, ENOMEM); return 1; } } -- cgit v1.2.3 From ee534a70ef35ba34f773d92ce336108e8d90b6bd Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Mon, 30 Nov 2020 00:31:21 +0100 Subject: pj_datum_set(): make code more obvious to humans and analyzers --- src/datum_set.cpp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'src/datum_set.cpp') diff --git a/src/datum_set.cpp b/src/datum_set.cpp index 398d85cd..3f612633 100644 --- a/src/datum_set.cpp +++ b/src/datum_set.cpp @@ -84,25 +84,27 @@ int pj_datum_set(PJ_CONTEXT *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) { 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) { proj_context_errno_set(ctx, ENOMEM); return 1; } + curr->next = param; + /* curr = param; */ } - - (void)curr; /* make clang static analyzer happy */ } /* -------------------------------------------------------------------- */ -- cgit v1.2.3