X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fstats%2Fks-one-sample.c;h=aaab53fa891a4e09b11b56b2a453a823547ab682;hb=4c5964204338f984c093f7905ce491ad8923e910;hp=aba2cbdef4cb5d0db99ccdc1bf5516e76000c3a4;hpb=32ee0e0402d6d56674f53a47d879ec5c07dabe09;p=pspp

diff --git a/src/language/stats/ks-one-sample.c b/src/language/stats/ks-one-sample.c
index aba2cbdef4..aaab53fa89 100644
--- a/src/language/stats/ks-one-sample.c
+++ b/src/language/stats/ks-one-sample.c
@@ -130,9 +130,10 @@ static void show_results (const struct ks *, const struct ks_one_sample_test *,
 
 void
 ks_one_sample_execute (const struct dataset *ds,
-		   struct casereader *input,
-                   enum mv_class exclude,
-		   const struct npar_test *test)
+		       struct casereader *input,
+		       enum mv_class exclude,
+		       const struct npar_test *test,
+		       bool x UNUSED, double y UNUSED)
 {
   const struct dictionary *dict = dataset_dict (ds);
   const struct ks_one_sample_test *kst = UP_CAST (test, const struct ks_one_sample_test, parent.parent);
@@ -142,8 +143,9 @@ ks_one_sample_execute (const struct dataset *ds,
   const struct fmt_spec *wfmt = wvar ? var_get_print_format (wvar) : & F_8_0;
   bool warn = true;
   int v;
+  struct casereader *r = casereader_clone (input);
 
-  struct ks *ks = xcalloc (sizeof *ks, ost->n_vars);
+  struct ks *ks = xcalloc (ost->n_vars, sizeof *ks);
 
   for (v = 0; v < ost->n_vars; ++v)
     {
@@ -156,8 +158,6 @@ ks_one_sample_execute (const struct dataset *ds,
       ks[v].ssq = 0;
     }
 
-  struct casereader *r = casereader_clone (input);
-
   for (; (c = casereader_read (r)) != NULL; case_unref (c))
     {
       const double weight = dict_get_case_weight (dict, c, &warn);
@@ -182,6 +182,10 @@ ks_one_sample_execute (const struct dataset *ds,
 
   for (v = 0; v < ost->n_vars; ++v)
     {
+      const struct variable *var = ost->vars[v];
+      double cc = 0;
+      double prev_empirical = 0;
+
       switch (kst->dist)
 	{
 	case KS_UNIFORM:
@@ -218,9 +222,6 @@ ks_one_sample_execute (const struct dataset *ds,
 	  NOT_REACHED ();
 	}
 
-      const struct variable *var = ost->vars[v];
-      double cc = 0;
-      double prev_empirical = 0;
       r = sort_execute_1var (casereader_clone (input), var);
       for (; (c = casereader_read (r)) != NULL; case_unref (c))
 	{