Make casewriters keep track of the number of `union value's in each

[pspp-builds.git] / src / data / scratch-writer.c

diff --git a/src/data/scratch-writer.c b/src/data/scratch-writer.c
index d8263df81ba2d72072d41072f7c8a14de81df8cb..e085ca1c28e59b7984251037067019add18984e4 100644 (file)
--- a/src/data/scratch-writer.c
+++ b/src/data/scratch-writer.c
@@ -1,20 +1,18 @@
-/* PSPP - computes sample statistics.
+/* PSPP - a program for statistical analysis.
    Copyright (C) 2006 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
-   This program is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-   02110-1301, USA. */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
 #include <config.h>
 
@@ -58,6 +56,7 @@ scratch_writer_open (struct file_handle *fh,
   struct dictionary *scratch_dict;
   struct dict_compactor *compactor;
   struct casewriter *casewriter;
+  size_t dict_value_cnt;
 
   if (!fh_open (fh, FH_REF_SCRATCH, "scratch file", "we"))
     return NULL;
@@ -76,6 +75,7 @@ scratch_writer_open (struct file_handle *fh,
     }
   else
     compactor = NULL;
+  dict_value_cnt = dict_get_next_value_idx (scratch_dict);
 
   /* Create new contents. */
   sh = xmalloc (sizeof *sh);
@@ -87,11 +87,11 @@ scratch_writer_open (struct file_handle *fh,
   writer->handle = sh;
   writer->fh = fh;
   writer->compactor = compactor;
-  writer->subwriter = autopaging_writer_create (dict_get_next_value_idx (
-                                               scratch_dict));
+  writer->subwriter = autopaging_writer_create (dict_value_cnt);
 
   fh_set_scratch_handle (fh, sh);
-  casewriter = casewriter_create (&scratch_writer_casewriter_class, writer);
+  casewriter = casewriter_create (dict_value_cnt,
+                                  &scratch_writer_casewriter_class, writer);
   taint_propagate (casewriter_get_taint (writer->subwriter),
                    casewriter_get_taint (casewriter));
   return casewriter;