X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fstats%2Fmedian.c;h=93ba08e21033ab35a2a81a6adb6938bf56e35dae;hb=e5f444ae6a67fdd38c5b08d5ba3592a7fb0f793a;hp=0f1ecd29482f542c592ccd743c50bd186016b816;hpb=5cab4cf3322f29c0ed7134d23740e07382914f20;p=pspp

diff --git a/src/language/stats/median.c b/src/language/stats/median.c
index 0f1ecd2948..93ba08e210 100644
--- a/src/language/stats/median.c
+++ b/src/language/stats/median.c
@@ -118,7 +118,7 @@ median_execute (const struct dataset *ds,
   const bool n_sample_test = (value_compare_3way (&nst->val2, &nst->val1,
 				       var_get_width (nst->indep_var)) > 0);
 
-  struct results *results = xcalloc (nst->n_vars, sizeof (*results));
+  struct results *results = XCALLOC (nst->n_vars,  struct results);
   int n_vals = 0;
   for (v = 0; v < nst->n_vars; ++v)
     {
@@ -134,7 +134,7 @@ median_execute (const struct dataset *ds,
 
       if (n_sample_test == false)
 	{
-	  struct val_node *vn = xzalloc (sizeof *vn);
+	  struct val_node *vn = XZALLOC (struct val_node);
 	  value_clone (&vn->val,  &nst->val1, var_get_width (nst->indep_var));
 	  hmap_insert (&map, &vn->node, value_hash (&nst->val1,
 					    var_get_width (nst->indep_var), 0));
@@ -145,7 +145,7 @@ median_execute (const struct dataset *ds,
 					    var_get_width (nst->indep_var), 0));
 	}
 
-      if ( median == SYSMIS)
+      if (median == SYSMIS)
 	{
 	  struct percentile *ptl;
 	  struct order_stats *os;
@@ -157,9 +157,9 @@ median_execute (const struct dataset *ds,
 	  rr = casereader_clone (r);
 	  writer = sort_create_writer (&sc, casereader_get_proto (rr));
 
-	  for (; (c = casereader_read (rr)) != NULL; )
+	  for (; (c = casereader_read (rr)) != NULL;)
 	    {
-	      if ( var_is_value_missing (var, case_data (c, var), exclude))
+	      if (var_is_value_missing (var, case_data (c, var)) & exclude)
 		{
 		  case_unref (c);
 		  continue;
@@ -196,7 +196,7 @@ median_execute (const struct dataset *ds,
 	  const union value *val = case_data (c, var);
 	  const union value *indep_val = case_data (c, nst->indep_var);
 
-	  if ( var_is_value_missing (var, case_data (c, var), exclude))
+	  if (var_is_value_missing (var, case_data (c, var)) & exclude)
 	    {
 	      continue;
 	    }
@@ -209,16 +209,16 @@ median_execute (const struct dataset *ds,
 		  value_compare_3way (indep_val, &nst->val1, width) < 0
 		||
 		  value_compare_3way (indep_val, &nst->val2, width) > 0
-		   )
+		)
 		{
 		  continue;
 		}
 	    }
 
 	  vn = find_value (&map, indep_val, nst->indep_var);
-	  if ( vn == NULL)
+	  if (vn == NULL)
 	    {
-	      if ( n_sample_test == true)
+	      if (n_sample_test == true)
 		{
 		  int width = var_get_width (nst->indep_var);
 		  vn = xzalloc (sizeof *vn);
@@ -253,7 +253,7 @@ median_execute (const struct dataset *ds,
 	  }
 
 	results[v].n = count;
-	results[v].sorted_array = xcalloc (hmap_count (&map), sizeof (void*));
+	results[v].sorted_array = XCALLOC (hmap_count (&map), struct val_node *);
 	results[v].var = var;
 
 	HMAP_FOR_EACH (vn, struct val_node, node, &map)