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, 11 insertions, 8 deletions

diff --git a/src/projections/wag7.cpp b/src/projections/wag7.cpp
index 3afb5a03..ee891243 100644
--- a/src/projections/wag7.cpp
+++ b/src/projections/wag7.cpp
@@ -11,15 +11,18 @@ PROJ_HEAD(wag7, "Wagner VII") "\n\tMisc Sph, no inv";
 
 static PJ_XY wag7_s_forward (PJ_LP lp, PJ *P) {           /* Spheroidal, forward */
     PJ_XY xy = {0.0, 0.0};
-	double theta, ct, D;
 
-	(void) P; /* Shut up compiler warnnings about unused P */
-
-	theta = asin (xy.y = 0.90630778703664996 * sin(lp.phi));
-	xy.x  = 2.66723 * (ct = cos (theta)) * sin (lp.lam /= 3.);
-	xy.y *= 1.24104 * (D = 1/(sqrt (0.5 * (1 + ct * cos (lp.lam)))));
-	xy.x *= D;
-	return (xy);
+    (void) P; /* Shut up compiler warnnings about unused P */
+
+    xy.y = 0.90630778703664996 * sin(lp.phi);
+    const double theta = asin (xy.y);
+    const double ct = cos (theta);
+    lp.lam /= 3.;
+    xy.x  = 2.66723 * ct * sin (lp.lam);
+    const double D = 1/(sqrt (0.5 * (1 + ct * cos (lp.lam))));
+    xy.y *= 1.24104 * D;
+    xy.x *= D;
+    return (xy);
 }