Introduce PJ_DEFAULT_CTX constant that improves code readability

8 files changed, 27 insertions, 25 deletions

diff --git a/src/PJ_cart.c b/src/PJ_cart.c
index 257d0dca..d50036b5 100644
--- a/src/PJ_cart.c
+++ b/src/PJ_cart.c
@@ -253,7 +253,7 @@ int pj_cart_selftest (void) {
     char buf[40];
 
     /* An utm projection on the GRS80 ellipsoid */
-    P = proj_create (0, arg);
+    P = proj_create (PJ_DEFAULT_CTX, arg);
     if (0==P)
         return 1;
 
@@ -262,7 +262,7 @@ int pj_cart_selftest (void) {
     proj_destroy (P);
 
     /* Same projection, now using argc/argv style initialization */
-    P = proj_create_argv (0, 3, args);
+    P = proj_create_argv (PJ_DEFAULT_CTX, 3, args);
     if (0==P)
         return 2;
 
@@ -306,7 +306,7 @@ int pj_cart_selftest (void) {
     proj_destroy (P);
 
     /* Now do some 3D transformations */
-    P = proj_create (0, "+proj=cart +ellps=GRS80");
+    P = proj_create (PJ_DEFAULT_CTX, "+proj=cart +ellps=GRS80");
     if (0==P)
         return 6;
 
@@ -374,7 +374,7 @@ int pj_cart_selftest (void) {
     /* Testing the proj_transform nightmare */
 
     /* An utm projection on the GRS80 ellipsoid */
-    P = proj_create (0, "+proj=utm +zone=32 +ellps=GRS80");
+    P = proj_create (PJ_DEFAULT_CTX, "+proj=utm +zone=32 +ellps=GRS80");
     if (0==P)
         return 13;
 
@@ -457,7 +457,7 @@ int pj_cart_selftest (void) {
     proj_destroy (P);
 
     /* test proj_create_crs_to_crs() */
-    P = proj_create_crs_to_crs(0, "epsg:25832", "epsg:25833");
+    P = proj_create_crs_to_crs(PJ_DEFAULT_CTX, "epsg:25832", "epsg:25833");
     if (P==0)
         return 50;
 
@@ -472,7 +472,7 @@ int pj_cart_selftest (void) {
     proj_destroy(P);
 
     /* let's make sure that only entries in init-files results in a usable PJ */
-    P = proj_create_crs_to_crs(0, "proj=utm +zone=32 +datum=WGS84", "proj=utm +zone=33 +datum=WGS84");
+    P = proj_create_crs_to_crs(PJ_DEFAULT_CTX, "proj=utm +zone=32 +datum=WGS84", "proj=utm +zone=33 +datum=WGS84");
     if (P != 0) {
         proj_destroy(P);
         return 52;
@@ -495,11 +495,11 @@ int pj_cart_selftest (void) {
     if (info.searchpath[0] == '\0') return 57;
 
     /* proj_pj_info() */
-    P = proj_create(0, "+proj=august"); /* august has no inverse */
+    P = proj_create(PJ_DEFAULT_CTX, "+proj=august"); /* august has no inverse */
     if (proj_pj_info(P).has_inverse) { proj_destroy(P); return 60; }
     proj_destroy(P);
 
-    P = proj_create(0, arg);
+    P = proj_create(PJ_DEFAULT_CTX, arg);
     pj_info = proj_pj_info(P);
     if ( !pj_info.has_inverse )            {  proj_destroy(P); return 61; }
     if ( strcmp(pj_info.definition, arg) ) {  proj_destroy(P); return 62; }
@@ -539,7 +539,7 @@ int pj_cart_selftest (void) {
 
 
     /* test proj_derivatives_retrieve() and proj_factors_retrieve() */
-    P = proj_create(0, "+proj=merc");
+    P = proj_create(PJ_DEFAULT_CTX, "+proj=merc");
     a = proj_obs_null;
     a.coo.lp.lam = PJ_TORAD(12);
     a.coo.lp.phi = PJ_TORAD(55);
diff --git a/src/PJ_hgridshift.c b/src/PJ_hgridshift.c
index 674b4da8..4ee3fd42 100644
--- a/src/PJ_hgridshift.c
+++ b/src/PJ_hgridshift.c
@@ -110,18 +110,18 @@ int pj_hgridshift_selftest (void) {
     double dist;
 
     /* fail on purpose: +grids parameter is mandatory*/
-    P = proj_create(0, "+proj=hgridshift");
+    P = proj_create(PJ_DEFAULT_CTX, "+proj=hgridshift");
     if (0!=P)
         return 99;
 
     /* fail on purpose: open non-existing grid */
-    P = proj_create(0, "+proj=hgridshift +grids=nonexistinggrid.gsb");
+    P = proj_create(PJ_DEFAULT_CTX, "+proj=hgridshift +grids=nonexistinggrid.gsb");
     if (0!=P)
         return 999;
 
 
     /* Failure most likely means the grid is missing */
-    P = proj_create (0, "+proj=hgridshift +grids=nzgd2kgrid0005.gsb +ellps=GRS80");
+    P = proj_create(PJ_DEFAULT_CTX, "+proj=hgridshift +grids=nzgd2kgrid0005.gsb +ellps=GRS80");
     if (0==P)
         return 10;
 
diff --git a/src/PJ_horner.c b/src/PJ_horner.c
index 43fe1896..a9a618c7 100644
--- a/src/PJ_horner.c
+++ b/src/PJ_horner.c
@@ -529,7 +529,7 @@ int pj_horner_selftest (void) {
     double dist;
 
     /* Real polynonia relating the technical coordinate system TC32 to "System 45 Bornholm" */
-    P = proj_create (0, tc32_utm32);
+    P = proj_create (PJ_DEFAULT_CTX, tc32_utm32);
     if (0==P)
         return 10;
 
@@ -543,7 +543,7 @@ int pj_horner_selftest (void) {
         return 1;
 
     /* The complex polynomial transformation between the "System Storebaelt" and utm32/ed50 */
-    P = proj_create (0, sb_utm32);
+    P = proj_create (PJ_DEFAULT_CTX, sb_utm32);
     if (0==P)
         return 11;
 
diff --git a/src/PJ_molodensky.c b/src/PJ_molodensky.c
index 49e27763..d9377234 100644
--- a/src/PJ_molodensky.c
+++ b/src/PJ_molodensky.c
@@ -338,7 +338,7 @@ int pj_molodensky_selftest (void) {
     PJ *P;
 
     /* Test the abridged Molodensky first. Example from appendix 3 of Deakin (2004). */
-    P = proj_create(0,
+    P = proj_create(PJ_DEFAULT_CTX,
         "+proj=molodensky +a=6378160 +rf=298.25 "
         "+da=-23 +df=-8.120449e-8 +dx=-134 +dy=-48 +dz=149 "
         "+abridged "
@@ -376,7 +376,7 @@ int pj_molodensky_selftest (void) {
 
     /* Test the abridged Molodensky first. Example from appendix 3 of Deaking (2004). */
 
-    P = proj_create(0,
+    P = proj_create(PJ_DEFAULT_CTX,
         "+proj=molodensky +a=6378160 +rf=298.25 "
         "+da=-23 +df=-8.120449e-8 +dx=-134 +dy=-48 +dz=149 "
     );
diff --git a/src/PJ_pipeline.c b/src/PJ_pipeline.c
index 6e42c0cb..a26f3ccf 100644
--- a/src/PJ_pipeline.c
+++ b/src/PJ_pipeline.c
@@ -526,7 +526,7 @@ int pj_pipeline_selftest (void) {
     double dist;
 
     /* forward-reverse geo->utm->geo */
-    P = proj_create (0, "+proj=pipeline +zone=32 +step +proj=utm +ellps=GRS80 +step +proj=utm +ellps=GRS80 +inv");
+    P = proj_create (PJ_DEFAULT_CTX, "+proj=pipeline +zone=32 +step +proj=utm +ellps=GRS80 +step +proj=utm +ellps=GRS80 +inv");
     if (0==P)
         return 1000;
     /* zero initialize everything, then set (longitude, latitude, height) to (12, 55, 0) */
@@ -548,7 +548,7 @@ int pj_pipeline_selftest (void) {
     proj_destroy (P);
 
     /* And now the back-to-back situation utm->geo->utm */
-    P = proj_create (0, "+proj=pipeline +zone=32 +step +proj=utm +ellps=GRS80 +inv +step +proj=utm +ellps=GRS80");
+    P = proj_create (PJ_DEFAULT_CTX, "+proj=pipeline +zone=32 +step +proj=utm +ellps=GRS80 +inv +step +proj=utm +ellps=GRS80");
     if (0==P)
         return 2000;
 
@@ -572,7 +572,7 @@ int pj_pipeline_selftest (void) {
 
 
     /* Finally testing a corner case: A rather pointless one-step pipeline geo->utm */
-    P = proj_create (0, "+proj=pipeline +zone=32 +step +proj=utm +ellps=GRS80 ");
+    P = proj_create (PJ_DEFAULT_CTX, "+proj=pipeline +zone=32 +step +proj=utm +ellps=GRS80 ");
     if (0==P)
         return 3000;
 
diff --git a/src/PJ_unitconvert.c b/src/PJ_unitconvert.c
index 06723399..7ce6035c 100644
--- a/src/PJ_unitconvert.c
+++ b/src/PJ_unitconvert.c
@@ -412,7 +412,7 @@ int pj_unitconvert_selftest (void) {return 0;}
 
 static int test_time(char* args, double tol, double t_in, double t_exp) {
     PJ_OBS in, out;
-    PJ *P = proj_create(0, args);
+    PJ *P = proj_create(PJ_DEFAULT_CTX, args);
     int ret = 0;
 
     if (P == 0)
@@ -438,7 +438,7 @@ static int test_time(char* args, double tol, double t_in, double t_exp) {
 
 static int test_xyz(char* args, double tol, PJ_TRIPLET in, PJ_TRIPLET exp) {
     PJ_OBS out, obs_in;
-    PJ *P = proj_create(0, args);
+    PJ *P = proj_create(PJ_DEFAULT_CTX, args);
     int ret = 0;
 
     if (P == 0)
diff --git a/src/PJ_vgridshift.c b/src/PJ_vgridshift.c
index e790cd4d..0f031d4f 100644
--- a/src/PJ_vgridshift.c
+++ b/src/PJ_vgridshift.c
@@ -112,18 +112,18 @@ int pj_vgridshift_selftest (void) {
     PJ_OBS expect, a, b;
     double dist;
 
-    /* fail on purpose: +grids parameter it mandatory*/
-    P = proj_create(0, "+proj=vgridshift");
+    /* fail on purpose: +grids parameter is mandatory*/
+    P = proj_create(PJ_DEFAULT_CTX, "+proj=vgridshift");
     if (0!=P)
         return 99;
 
     /* fail on purpose: open non-existing grid */
-    P = proj_create(0, "+proj=vgridshift +grids=nonexistinggrid.gtx");
+    P = proj_create(PJ_DEFAULT_CTX, "+proj=vgridshift +grids=nonexistinggrid.gtx");
     if (0!=P)
         return 999;
 
     /* Failure most likely means the grid is missing */
-    P = proj_create (0, "+proj=vgridshift +grids=egm96_15.gtx +ellps=GRS80");
+    P = proj_create(PJ_DEFAULT_CTX, "+proj=vgridshift +grids=egm96_15.gtx +ellps=GRS80");
     if (0==P)
         return 10;
 
diff --git a/src/proj.h b/src/proj.h
index 943c500f..badde4cc 100644
--- a/src/proj.h
+++ b/src/proj.h
@@ -355,10 +355,12 @@ typedef struct projCtx_t PJ_CONTEXT;
 
 
 /* Functionality for handling thread contexts */
+#define PJ_DEFAULT_CTX 0
 PJ_CONTEXT *proj_context_create (void);
 void proj_context_destroy    (PJ_CONTEXT *ctx);
 
 
+
 /* Manage the transformation definition object PJ */
 PJ  *proj_create (PJ_CONTEXT *ctx, const char *definition);
 PJ  *proj_create_argv (PJ_CONTEXT *ctx, int argc, char **argv);