From: Ben Pfaff <blp@cs.stanford.edu>
Date: Sat, 18 Sep 2010 04:17:43 +0000 (-0700)
Subject: ONEWAY: Fix declaration-after-statement warning.
X-Git-Tag: sav-api~38
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?p=pspp;a=commitdiff_plain;h=dc7b35971ff0214f6dc5f1a2c909a63a053a95b7

ONEWAY: Fix declaration-after-statement warning.

C90 requires declarations to precede statements within a block.
---

diff --git a/src/language/stats/oneway.c b/src/language/stats/oneway.c
index ba7fc5b2a1..aa8a255211 100644
--- a/src/language/stats/oneway.c
+++ b/src/language/stats/oneway.c
@@ -360,14 +360,14 @@ updateit (void *user_data,
 
   const union value *valx = case_data (c, varp);
 
+  struct descriptive_data *dd_total = aux2;
+
+  double weight;
+
   if ( var_is_value_missing (varp, valx, exclude))
     return;
 
-  struct descriptive_data *dd_total = aux2;
-
-  double weight = 1.0;
-  if (wv)
-    weight = case_data (c, wv)->f;
+  weight = wv != NULL ? case_data (c, wv)->f : 1.0;
 
   moments1_add (dd->mom, valx->f, weight);
   if (valx->f * weight < dd->minimum)