Merge commit 'origin/stable'

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

diff --git a/src/data/scratch-writer.c b/src/data/scratch-writer.c
index ed88af6db4ee1a211443702de9545c251546abc7..631305fe9d96c6a668c33473780867930f88d3a4 100644 (file)
--- a/src/data/scratch-writer.c
+++ b/src/data/scratch-writer.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2006 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2009 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
@@ -59,7 +59,6 @@ scratch_writer_open (struct file_handle *fh,
   struct scratch_writer *writer;
   struct casewriter *casewriter;
   struct fh_lock *lock;
-  size_t dict_value_cnt;
 
   /* Get exclusive write access to handle. */
   /* TRANSLATORS: this fragment will be interpolated into
@@ -83,10 +82,9 @@ scratch_writer_open (struct file_handle *fh,
     }
   else
     writer->compactor = NULL;
-  dict_value_cnt = dict_get_next_value_idx (writer->dict);
-  writer->subwriter = autopaging_writer_create (dict_value_cnt);
+  writer->subwriter = autopaging_writer_create (dict_get_proto (writer->dict));
 
-  casewriter = casewriter_create (dict_value_cnt,
+  casewriter = casewriter_create (dict_get_proto (writer->dict),
                                   &scratch_writer_casewriter_class, writer);
   taint_propagate (casewriter_get_taint (writer->subwriter),
                    casewriter_get_taint (casewriter));
@@ -99,15 +97,8 @@ scratch_writer_casewriter_write (struct casewriter *w UNUSED, void *writer_,
                                  struct ccase *c)
 {
   struct scratch_writer *writer = writer_;
-  struct ccase tmp;
-  if (writer->compactor)
-    {
-      case_map_execute (writer->compactor, c, &tmp);
-      case_destroy (c);
-    }
-  else
-    case_move (&tmp, c);
-  casewriter_write (writer->subwriter, &tmp);
+  casewriter_write (writer->subwriter,
+                    case_map_execute (writer->compactor, c));
 }
 
 /* Closes WRITER. */