Complete re-implementation of the EXAMINE command.

[pspp-builds.git] / src / data / casewriter.c

diff --git a/src/data/casewriter.c b/src/data/casewriter.c
index eac02b16865e5b9348a3575af03e819982070114..4461d85e84cfc191821746df34e44b02dfc0f4ef 100644 (file)
--- a/src/data/casewriter.c
+++ b/src/data/casewriter.c
@@ -91,8 +91,7 @@ casewriter_get_value_cnt (const struct casewriter *writer)
 struct casereader *
 casewriter_make_reader (struct casewriter *writer)
 {
-  struct casereader *reader;
-  reader = writer->class->convert_to_reader (writer, writer->aux);
+  struct casereader *reader = writer->class->convert_to_reader (writer, writer->aux);
   taint_propagate (writer->taint, casereader_get_taint (reader));
   taint_destroy (writer->taint);
   free (writer);
@@ -170,7 +169,7 @@ casewriter_create (size_t value_cnt,
 struct casewriter *
 autopaging_writer_create (size_t value_cnt)
 {
-  return create_casewriter_window (value_cnt, get_workspace_cases (value_cnt));
+  return create_casewriter_window (value_cnt, settings_get_workspace_cases (value_cnt));
 }
 
 /* Returns a casewriter for cases with VALUE_CNT struct values
@@ -241,10 +240,11 @@ casewriter_window_convert_to_reader (struct casewriter *writer UNUSED,
                                      void *window_)
 {
   struct casewindow *window = window_;
-  struct casereader *reader;
-  reader = casereader_create_random (casewindow_get_value_cnt (window),
-                                     casewindow_get_case_cnt (window),
-                                     &casereader_window_class, window);
+  struct casereader *reader =
+    casereader_create_random (casewindow_get_value_cnt (window),
+                             casewindow_get_case_cnt (window),
+                             &casereader_window_class, window);
+
   taint_propagate (casewindow_get_taint (window),
                    casereader_get_taint (reader));
   return reader;