Fix warnings of latest cppcheck master

2 files changed, 13 insertions, 7 deletions

diff --git a/src/projections/aea.cpp b/src/projections/aea.cpp
index 7b5c0fb5..c9d24245 100644
--- a/src/projections/aea.cpp
+++ b/src/projections/aea.cpp
@@ -62,8 +62,11 @@ static double phi1_(double qs, double Te, double Tone_es) {
            sinpi / com + .5 / Te * log ((1. - con) /
            (1. + con)));
         Phi += dphi;
-    } while (fabs(dphi) > TOL && --i);
-    return( i ? Phi : HUGE_VAL );
+        if( !(fabs(dphi) > TOL) )
+          return Phi;
+        --i;
+    } while (i >= 0);
+    return HUGE_VAL;
 }
 
 
diff --git a/src/projections/poly.cpp b/src/projections/poly.cpp
index 08a4aaad..fc7fc8bd 100644
--- a/src/projections/poly.cpp
+++ b/src/projections/poly.cpp
@@ -116,15 +116,18 @@ static PJ_LP poly_s_inverse (PJ_XY xy, PJ *P) {           /* Spheroidal, inverse
         lp.phi = xy.y;
         B = xy.x * xy.x + xy.y * xy.y;
         i = N_ITER;
-        do {
+        while(true) {
             tp = tan(lp.phi);
             lp.phi -= (dphi = (xy.y * (lp.phi * tp + 1.) - lp.phi -
                 .5 * ( lp.phi * lp.phi + B) * tp) /
                 ((lp.phi - xy.y) / tp - 1.));
-        } while (fabs(dphi) > CONV && --i);
-        if (! i) {
-            proj_errno_set(P, PJD_ERR_TOLERANCE_CONDITION);
-            return lp;
+            if( !(fabs(dphi) > CONV) )
+                break;
+            --i;
+            if( i == 0 ) {
+                proj_errno_set(P, PJD_ERR_TOLERANCE_CONDITION);
+                return lp;
+            }
         }
         lp.lam = asin(xy.x * tan(lp.phi)) / sin(lp.phi);
     }