Fix GCC 7 warnings related to misleading indentations, fallthrough cases and unused variable

9 files changed, 28 insertions, 7 deletions

diff --git a/src/PJ_aeqd.c b/src/PJ_aeqd.c
index 907e7d44..92b81748 100644
--- a/src/PJ_aeqd.c
+++ b/src/PJ_aeqd.c
@@ -82,6 +82,7 @@ static XY e_forward (LP lp, PJ *P) {          /* Ellipsoidal, forward */
     switch (Q->mode) {
     case N_POLE:
         coslam = - coslam;
+        /*-fallthrough*/
     case S_POLE:
         xy.x = (rho = fabs(Q->Mp - pj_mlfn(lp.phi, sinphi, cosphi, Q->en))) *
             sin(lp.lam);
@@ -138,6 +139,7 @@ oblcon:
     case N_POLE:
         lp.phi = -lp.phi;
         coslam = -coslam;
+        /*-fallthrough*/
     case S_POLE:
         if (fabs(lp.phi - M_HALFPI) < EPS10) F_ERROR;
         xy.x = (xy.y = (M_HALFPI + lp.phi)) * sin(lp.lam);
diff --git a/src/PJ_gnom.c b/src/PJ_gnom.c
index 37f5d71f..a925d43e 100644
--- a/src/PJ_gnom.c
+++ b/src/PJ_gnom.c
@@ -52,6 +52,7 @@ static XY s_forward (LP lp, PJ *P) {           /* Spheroidal, forward */
             break;
         case N_POLE:
             coslam = - coslam;
+            /*-fallthrough*/
         case S_POLE:
             xy.y *= cosphi * coslam;
             break;
diff --git a/src/PJ_helmert.c b/src/PJ_helmert.c
index 72cefe90..8ae0a785 100644
--- a/src/PJ_helmert.c
+++ b/src/PJ_helmert.c
@@ -57,7 +57,7 @@ static void *freeup_msg (PJ *P, int errlev) {         /* Destructor */
     if (0==P)
         return 0;
 
-	if (0!=P->ctx)
+    if (0!=P->ctx)
         pj_ctx_set_errno (P->ctx, errlev);
 
     if (0==P->opaque)
diff --git a/src/PJ_laea.c b/src/PJ_laea.c
index a92c2a4a..d4535dd0 100644
--- a/src/PJ_laea.c
+++ b/src/PJ_laea.c
@@ -106,6 +106,7 @@ oblcon:
         break;
     case N_POLE:
         coslam = -coslam;
+        /*-fallthrough*/
     case S_POLE:
         if (fabs(lp.phi + P->phi0) < EPS10) F_ERROR;
         xy.y = M_FORTPI - lp.phi * .5;
@@ -148,6 +149,7 @@ static LP e_inverse (XY xy, PJ *P) {          /* Ellipsoidal, inverse */
         break;
     case N_POLE:
         xy.y = -xy.y;
+        /*-fallthrough*/
     case S_POLE:
         q = (xy.x * xy.x + xy.y * xy.y);
         if (!q) {
diff --git a/src/PJ_nsper.c b/src/PJ_nsper.c
index 014c711b..32059bcf 100644
--- a/src/PJ_nsper.c
+++ b/src/PJ_nsper.c
@@ -63,6 +63,7 @@ static XY s_forward (LP lp, PJ *P) {           /* Spheroidal, forward */
         break;
     case N_POLE:
         coslam = - coslam;
+        /*-fallthrough*/
     case S_POLE:
         xy.y *= cosphi * coslam;
         break;
diff --git a/src/PJ_ortho.c b/src/PJ_ortho.c
index a6527e72..d0897a72 100644
--- a/src/PJ_ortho.c
+++ b/src/PJ_ortho.c
@@ -35,6 +35,7 @@ static XY s_forward (LP lp, PJ *P) {           /* Spheroidal, forward */
 		break;
 	case N_POLE:
 		coslam = - coslam;
+                /*-fallthrough*/
 	case S_POLE:
 		if (fabs(lp.phi - P->phi0) - EPS10 > M_HALFPI) F_ERROR;
 		xy.y = cosphi * coslam;
diff --git a/src/PJ_stere.c b/src/PJ_stere.c
index c08b1093..5ca1b9d9 100644
--- a/src/PJ_stere.c
+++ b/src/PJ_stere.c
@@ -62,6 +62,7 @@ xmul:
         lp.phi = -lp.phi;
         coslam = - coslam;
         sinphi = -sinphi;
+        /*-fallthrough*/
     case N_POLE:
         xy.x = Q->akm1 * pj_tsfn (lp.phi, sinphi, P->e);
         xy.y = - xy.x * coslam;
@@ -98,6 +99,7 @@ oblcon:
     case N_POLE:
         coslam = - coslam;
         lp.phi = - lp.phi;
+        /*-fallthrough*/
     case S_POLE:
         if (fabs (lp.phi - M_HALFPI) < TOL) F_ERROR;
         xy.x = sinlam * ( xy.y = Q->akm1 * tan (M_FORTPI + .5 * lp.phi) );
@@ -134,6 +136,7 @@ static LP e_inverse (XY xy, PJ *P) {          /* Ellipsoidal, inverse */
         break;
     case N_POLE:
         xy.y = -xy.y;
+        /*-fallthrough*/
     case S_POLE:
         phi_l = M_HALFPI - 2. * atan (tp = - rho / Q->akm1);
         halfpi = -M_HALFPI;
@@ -183,6 +186,7 @@ static LP s_inverse (XY xy, PJ *P) {           /* Spheroidal, inverse */
         break;
     case N_POLE:
         xy.y = -xy.y;
+        /*-fallthrough*/
     case S_POLE:
         if (fabs (rh) <= EPS10)
             lp.phi = P->phi0;
@@ -251,6 +255,7 @@ static PJ *setup(PJ *P) {                   /* general initialization */
         case OBLIQ:
             sinph0 = sin (P->phi0);
             cosph0 = cos (P->phi0);
+            /*-fallthrough*/
         case EQUIT:
             Q->akm1 = 2. * P->k0;
             break;
diff --git a/src/pj_run_selftests.c b/src/pj_run_selftests.c
index fe67e9cd..87aee76d 100644
--- a/src/pj_run_selftests.c
+++ b/src/pj_run_selftests.c
@@ -32,6 +32,7 @@
 
 #ifndef PJ_SELFTEST
 int pj_run_selftests (int verbosity) {
+    (void)verbosity;
     printf ("This version of libproj is not configured for internal regression tests.\n");
     return 0;
 }
diff --git a/src/pj_transform.c b/src/pj_transform.c
index cf840db4..26a22ab9 100644
--- a/src/pj_transform.c
+++ b/src/pj_transform.c
@@ -846,17 +846,25 @@ static int pj_adjust_axis( projCtx ctx,
                 switch( axis[i_axis] )
                 {
                   case 'e':
-                    x[point_offset*i] = value; break;
+                    x[point_offset*i] = value;
+                    break;
                   case 'w':
-                    x[point_offset*i] = -value; break;
+                    x[point_offset*i] = -value;
+                    break;
                   case 'n':
-                    y[point_offset*i] = value; break;
+                    y[point_offset*i] = value;
+                    break;
                   case 's':
-                    y[point_offset*i] = -value; break;
+                    y[point_offset*i] = -value;
+                    break;
                   case 'u':
-                    if( z ) z[point_offset*i] = value; break;
+                    if( z )
+                        z[point_offset*i] = value;
+                    break;
                   case 'd':
-                    if( z ) z[point_offset*i] = -value; break;
+                    if( z )
+                        z[point_offset*i] = -value;
+                    break;
                   default:
                     pj_ctx_set_errno( ctx, PJD_ERR_AXIS );
                     return PJD_ERR_AXIS;