work

[pspp] / src / language / stats / ctables.c

diff --git a/src/language/stats/ctables.c b/src/language/stats/ctables.c
index b2bf14b39992e4f24a02aa55dd29d4af1002218a..69c505c48624ec5ad096b09c67a1ed88a53ceb71 100644 (file)
--- a/src/language/stats/ctables.c
+++ b/src/language/stats/ctables.c
@@ -6021,14 +6021,15 @@ put_title_text (struct string *out, struct substring in, time_t now,
 int
 cmd_ctables (struct lexer *lexer, struct dataset *ds)
 {
-  struct casereader *input;
-  if (measure_guesser_is_needed (ds))
+  struct casereader *input = NULL;
+
+  struct measure_guesser *mg = measure_guesser_create (ds);
+  if (mg)
     {
       input = proc_open (ds);
-      measure_guesser_run (ds, input);
+      measure_guesser_run (mg, input);
+      measure_guesser_destroy (mg);
     }
-  else
-    input = NULL;
 
   size_t n_vars = dict_get_n_vars (dataset_dict (ds));
   enum ctables_vlabel *vlabels = xnmalloc (n_vars, sizeof *vlabels);