[Pspp-cvs] pspp/src/language/stats ChangeLog crosstabs.q f...

[Ben Pfaff]

CVSROOT:        /cvsroot/pspp
Module name:    pspp
Changes by:     Ben Pfaff <blp> 07/12/08 06:05:35

Modified files:
        src/language/stats: ChangeLog crosstabs.q frequencies.q 

Log message:
        Patch #6302.
        
        * crosstabs.q (precalc): Initialize data structures even if the
        first case cannot be read.  
        
        * frequencies.q (precalc): Ditto.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/stats/ChangeLog?cvsroot=pspp&r1=1.69&r2=1.70
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/stats/crosstabs.q?cvsroot=pspp&r1=1.37&r2=1.38
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/stats/frequencies.q?cvsroot=pspp&r1=1.38&r2=1.39

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/stats/ChangeLog,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -b -r1.69 -r1.70
--- ChangeLog   3 Nov 2007 22:00:06 -0000       1.69
+++ ChangeLog   8 Dec 2007 06:05:35 -0000       1.70
@@ -1,3 +1,12 @@
+2007-12-07  Ben Pfaff  <address@hidden>
+
+       Patch #6302.
+
+       * crosstabs.q (precalc): Initialize data structures even if the
+       first case cannot be read.  
+
+       * frequencies.q (precalc): Ditto.
+
 2007-11-03  Ben Pfaff  <address@hidden>
 
        Allow output files to overwrite input files (bug #21280).

Index: crosstabs.q
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/stats/crosstabs.q,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- crosstabs.q 12 Oct 2007 04:54:46 -0000      1.37
+++ crosstabs.q 8 Dec 2007 06:05:35 -0000       1.38
@@ -520,10 +520,11 @@
 {
   struct ccase c;
 
-  if (!casereader_peek (input, 0, &c))
-    return;
+  if (casereader_peek (input, 0, &c))
+    {
   output_split_file_values (ds, &c);
   case_destroy (&c);
+    }
 
   if (mode == GENERAL)
     {

Index: frequencies.q
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/stats/frequencies.q,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- frequencies.q       11 Nov 2007 05:51:43 -0000      1.38
+++ frequencies.q       8 Dec 2007 06:05:35 -0000       1.39
@@ -538,10 +538,11 @@
   struct ccase c;
   size_t i;
 
-  if (!casereader_peek (input, 0, &c))
-    return;
+  if (casereader_peek (input, 0, &c))
+    {
   output_split_file_values (ds, &c);
   case_destroy (&c);
+    }
 
   pool_destroy (data_pool);
   data_pool = pool_create ();