X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fstats%2Faggregate.c;h=b3d02e141346ba2bb2bf8eccd60fa1665c3015cf;hb=d0b91eae59319ab2756d0d43b9cb15eb9cd3c234;hp=08d2f5e15c7d06176f1787b5e81017c7da54ad83;hpb=b40baf410822471fbdeeec553693619d60d7c7b6;p=pspp-builds.git

diff --git a/src/language/stats/aggregate.c b/src/language/stats/aggregate.c
index 08d2f5e1..b3d02e14 100644
--- a/src/language/stats/aggregate.c
+++ b/src/language/stats/aggregate.c
@@ -196,6 +196,7 @@ cmd_aggregate (struct lexer *lexer, struct dataset *ds)
   dict_set_documents (agr.dict, dict_get_documents (dict));
 
   /* OUTFILE subcommand must be first. */
+  lex_match (lexer, '/');
   if (!lex_force_match_id (lexer, "OUTFILE"))
     goto error;
   lex_match (lexer, '=');
@@ -965,20 +966,20 @@ dump_aggregate_info (struct agr_proc *agr, struct casewriter *output)
 	  case MEDIAN:
 	    {
 	      struct casereader *sorted_reader;
-	      struct order_stats *median = percentile_create (0.5, i->cc);
+	      struct percentile *median = percentile_create (0.5, i->cc);
+              struct order_stats *os = &median->parent;
 
 	      sorted_reader = casewriter_make_reader (i->writer);
 
-	      order_stats_accumulate (&median, 1,
+	      order_stats_accumulate (&os, 1,
 				      sorted_reader,
 				      i->weight,
 				      i->subject,
 				      i->exclude);
 
-	      v->f = percentile_calculate ((struct percentile *) median,
-					   PC_HAVERAGE);
+	      v->f = percentile_calculate (median, PC_HAVERAGE);
 
-	      statistic_destroy ((struct statistic *) median);
+	      statistic_destroy (&median->parent.parent);
 	    }
 	    break;
 	  case SD: