X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fstats%2Fmedian.c;h=c15108896ba575ca508a4dd14dc62089f668d5cb;hb=1e9875fc6bd073f970e28de5ef49e82717705858;hp=8fa38c5a692134506e5c71ff67255ee2c487378d;hpb=8f7af0acaf8a9253242d89fcdb26e285841f7833;p=pspp

diff --git a/src/language/stats/median.c b/src/language/stats/median.c
index 8fa38c5a69..c15108896b 100644
--- a/src/language/stats/median.c
+++ b/src/language/stats/median.c
@@ -159,7 +159,7 @@ median_execute (const struct dataset *ds,
 
 	  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;
@@ -168,7 +168,7 @@ median_execute (const struct dataset *ds,
 	      cc += dict_get_case_weight (dict, c, &warn);
 	      casewriter_write (writer, c);
 	    }
-	  subcase_destroy (&sc);
+	  subcase_uninit (&sc);
 	  casereader_destroy (rr);
 
 	  rr = casewriter_make_reader (writer);
@@ -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;
 	    }
@@ -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)