aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorKristian Evers <kristianevers@gmail.com>2018-02-01 20:01:52 +0100
committerKristian Evers <kristianevers@gmail.com>2018-02-01 23:53:11 +0100
commitc0099e5ad4515e4ee1d672328731b004071489f4 (patch)
tree86c3accd339b512f54233e8f50685d76739db1bd /src
parent22f5b764f35febf66293c81189a55e20939cea04 (diff)
downloadPROJ-c0099e5ad4515e4ee1d672328731b004071489f4.tar.gz
PROJ-c0099e5ad4515e4ee1d672328731b004071489f4.zip
Make sure to mark parameters used when found with pj_param_exists. Closes #752
Diffstat (limited to 'src')
-rw-r--r--src/pj_init.c1
-rw-r--r--src/pj_param.c4
2 files changed, 3 insertions, 2 deletions
diff --git a/src/pj_init.c b/src/pj_init.c
index 51a742c7..0acc6c71 100644
--- a/src/pj_init.c
+++ b/src/pj_init.c
@@ -554,7 +554,6 @@ pj_init_ctx(projCtx ctx, int argc, char **argv) {
curr = pj_param_exists (start, "proj");
if (0==curr)
return pj_dealloc_params (ctx, start, PJD_ERR_PROJ_NOT_NAMED);
- curr->used = 1;
name = curr->param;
if (strlen (name) < 6)
return pj_dealloc_params (ctx, start, PJD_ERR_PROJ_NOT_NAMED);
diff --git a/src/pj_param.c b/src/pj_param.c
index 72175ed9..133f3ea6 100644
--- a/src/pj_param.c
+++ b/src/pj_param.c
@@ -75,8 +75,10 @@ paralist *pj_param_exists (paralist *list, const char *parameter) {
return 0;
for (next = list; next; next = next->next) {
- if (0==strncmp (parameter, next->param, len) && (next->param[len]=='=' || next->param[len]==0))
+ if (0==strncmp (parameter, next->param, len) && (next->param[len]=='=' || next->param[len]==0)) {
+ next->used = 1;
return next;
+ }
if (0==strcmp (parameter, "step"))
return 0;
}