src/projections/: remove assignments in expression and multiple statements per line

Should hopefully result in no change in results, and hopefully more
readable code...

1 files changed, 21 insertions, 21 deletions

diff --git a/src/projections/wink2.cpp b/src/projections/wink2.cpp
index 4aaf1972..7fd08649 100644
--- a/src/projections/wink2.cpp
+++ b/src/projections/wink2.cpp
@@ -20,25 +20,25 @@ struct pj_opaque {
 
 static PJ_XY wink2_s_forward (PJ_LP lp, PJ *P) {           /* Spheroidal, forward */
     PJ_XY xy = {0.0, 0.0};
-	double k, V;
-	int i;
-
-	xy.y = lp.phi * M_TWO_D_PI;
-	k = M_PI * sin (lp.phi);
-	lp.phi *= 1.8;
-	for (i = MAX_ITER; i ; --i) {
-		lp.phi -= V = (lp.phi + sin (lp.phi) - k) /
-			(1. + cos (lp.phi));
-		if (fabs (V) < LOOP_TOL)
-			break;
-	}
-	if (!i)
-		lp.phi = (lp.phi < 0.) ? -M_HALFPI : M_HALFPI;
-	else
-		lp.phi *= 0.5;
-	xy.x = 0.5 * lp.lam * (cos (lp.phi) + static_cast<struct pj_opaque*>(P->opaque)->cosphi1);
-	xy.y = M_FORTPI * (sin (lp.phi) + xy.y);
-	return xy;
+    int i;
+
+    xy.y = lp.phi * M_TWO_D_PI;
+    const double k = M_PI * sin (lp.phi);
+    lp.phi *= 1.8;
+    for (i = MAX_ITER; i ; --i) {
+        const double V = (lp.phi + sin (lp.phi) - k) /
+                            (1. + cos (lp.phi));
+        lp.phi -= V;
+        if (fabs (V) < LOOP_TOL)
+                break;
+    }
+    if (!i)
+        lp.phi = (lp.phi < 0.) ? -M_HALFPI : M_HALFPI;
+    else
+        lp.phi *= 0.5;
+    xy.x = 0.5 * lp.lam * (cos (lp.phi) + static_cast<struct pj_opaque*>(P->opaque)->cosphi1);
+    xy.y = M_FORTPI * (sin (lp.phi) + xy.y);
+    return xy;
 }
 
 
@@ -48,8 +48,8 @@ PJ *PROJECTION(wink2) {
         return pj_default_destructor(P, ENOMEM);
     P->opaque = Q;
 
-	static_cast<struct pj_opaque*>(P->opaque)->cosphi1 = cos(pj_param(P->ctx, P->params, "rlat_1").f);
-	P->es  = 0.;
+    static_cast<struct pj_opaque*>(P->opaque)->cosphi1 = cos(pj_param(P->ctx, P->params, "rlat_1").f);
+    P->es  = 0.;
     P->inv = nullptr;
     P->fwd = wink2_s_forward;