Portability cleanups for the code in PR #6 (and a few additional source files)

Eliminated mixed code and declarations, converted C++ style comments and
probably did a few more things highlighted by running gcc with the "-W
-Wall -Wextra -pedantic" flags

1 files changed, 15 insertions, 15 deletions

diff --git a/src/pj_utils.c b/src/pj_utils.c
index f11081fc..203c637c 100644
--- a/src/pj_utils.c
+++ b/src/pj_utils.c
@@ -78,27 +78,27 @@ PJ *pj_latlong_from_proj( PJ *pj_in )
     if( pj_param(pj_in->ctx, pj_in->params, "tdatum").i )
     {
         got_datum = TRUE;
-        sprintf( defn+strlen(defn), " +datum=%s", 
+        sprintf( defn+strlen(defn), " +datum=%s",
                  pj_param(pj_in->ctx, pj_in->params,"sdatum").s );
     }
     else if( pj_param(pj_in->ctx, pj_in->params, "tellps").i )
     {
-        sprintf( defn+strlen(defn), " +ellps=%s", 
+        sprintf( defn+strlen(defn), " +ellps=%s",
                  pj_param(pj_in->ctx, pj_in->params,"sellps").s );
     }
     else if( pj_param(pj_in->ctx,pj_in->params, "ta").i )
     {
-        sprintf( defn+strlen(defn), " +a=%s", 
+        sprintf( defn+strlen(defn), " +a=%s",
                  pj_param(pj_in->ctx,pj_in->params,"sa").s );
-            
+
         if( pj_param(pj_in->ctx,pj_in->params, "tb").i )
-            sprintf( defn+strlen(defn), " +b=%s", 
+            sprintf( defn+strlen(defn), " +b=%s",
                      pj_param(pj_in->ctx,pj_in->params,"sb").s );
         else if( pj_param(pj_in->ctx,pj_in->params, "tes").i )
-            sprintf( defn+strlen(defn), " +es=%s", 
+            sprintf( defn+strlen(defn), " +es=%s",
                      pj_param(pj_in->ctx,pj_in->params,"ses").s );
         else if( pj_param(pj_in->ctx,pj_in->params, "tf").i )
-            sprintf( defn+strlen(defn), " +f=%s", 
+            sprintf( defn+strlen(defn), " +f=%s",
                      pj_param(pj_in->ctx,pj_in->params,"sf").s );
         else
         {
@@ -121,17 +121,17 @@ PJ *pj_latlong_from_proj( PJ *pj_in )
     if( !got_datum )
     {
         if( pj_param(pj_in->ctx,pj_in->params, "ttowgs84").i )
-            sprintf( defn+strlen(defn), " +towgs84=%s", 
+            sprintf( defn+strlen(defn), " +towgs84=%s",
                      pj_param(pj_in->ctx,pj_in->params,"stowgs84").s );
 
         if( pj_param(pj_in->ctx,pj_in->params, "tnadgrids").i )
-            sprintf( defn+strlen(defn), " +nadgrids=%s", 
+            sprintf( defn+strlen(defn), " +nadgrids=%s",
                      pj_param(pj_in->ctx,pj_in->params,"snadgrids").s );
     }
 
     /* copy over some other information related to ellipsoid */
     if( pj_param(pj_in->ctx,pj_in->params, "tR").i )
-        sprintf( defn+strlen(defn), " +R=%s", 
+        sprintf( defn+strlen(defn), " +R=%s",
                  pj_param(pj_in->ctx,pj_in->params,"sR").s );
 
     if( pj_param(pj_in->ctx,pj_in->params, "tR_A").i )
@@ -144,16 +144,16 @@ PJ *pj_latlong_from_proj( PJ *pj_in )
         sprintf( defn+strlen(defn), " +R_a" );
 
     if( pj_param(pj_in->ctx,pj_in->params, "tR_lat_a").i )
-        sprintf( defn+strlen(defn), " +R_lat_a=%s", 
+        sprintf( defn+strlen(defn), " +R_lat_a=%s",
                  pj_param(pj_in->ctx,pj_in->params,"sR_lat_a").s );
 
     if( pj_param(pj_in->ctx,pj_in->params, "tR_lat_g").i )
-        sprintf( defn+strlen(defn), " +R_lat_g=%s", 
+        sprintf( defn+strlen(defn), " +R_lat_g=%s",
                  pj_param(pj_in->ctx,pj_in->params,"sR_lat_g").s );
 
     /* copy over prime meridian */
     if( pj_param(pj_in->ctx,pj_in->params, "tpm").i )
-        sprintf( defn+strlen(defn), " +pm=%s", 
+        sprintf( defn+strlen(defn), " +pm=%s",
                  pj_param(pj_in->ctx,pj_in->params,"spm").s );
 
     return pj_init_plus_ctx( pj_in->ctx, defn );
@@ -172,7 +172,7 @@ void pj_get_spheroid_defn(projPJ defn, double *major_axis, double *eccentricity_
 {
 	if ( major_axis )
 		*major_axis = defn->a;
-		
+
 	if ( eccentricity_squared )
 		*eccentricity_squared = defn->es;
-};
+}