[Pspp-cvs] pspp/src/data casefile.c ChangeLog

[Ben Pfaff]

CVSROOT:        /cvsroot/pspp
Module name:    pspp
Changes by:     Ben Pfaff <blp> 06/10/14 23:57:54

Modified files:
        src/data       : casefile.c ChangeLog 

Log message:
                * casefile.c (casereader_read_xfer): Always initialize the case,
                even on an error condition.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pspp/src/data/casefile.c?cvsroot=pspp&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/pspp/src/data/ChangeLog?cvsroot=pspp&r1=1.64&r2=1.65

Patches:
Index: casefile.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/data/casefile.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- casefile.c  25 Sep 2006 09:35:15 -0000      1.16
+++ casefile.c  14 Oct 2006 23:57:54 -0000      1.17
@@ -150,6 +150,7 @@
 
   struct ccase *read_case = NULL ;
 
+  case_nullify (c);
   if ( casefile_error (cf) )
     return false;
 
@@ -157,10 +158,7 @@
   if ( ! read_case ) return false;
 
   if ( ffr->destructive && casefile_in_core (cf) )
-    {
-      case_nullify (c);
     case_move (c, read_case);
-    }
   else
     case_clone (c, read_case);
 

Index: ChangeLog
===================================================================
RCS file: /cvsroot/pspp/pspp/src/data/ChangeLog,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -b -r1.64 -r1.65
--- ChangeLog   27 Sep 2006 10:21:35 -0000      1.64
+++ ChangeLog   14 Oct 2006 23:57:54 -0000      1.65
@@ -1,3 +1,8 @@
+Sat Oct 14 16:56:44 2006  Ben Pfaff  <address@hidden>
+
+       * casefile.c (casereader_read_xfer): Always initialize the case,
+       even on an error condition.
+
 Wed Sep 27 09:37:49 WST 2006 John Darrington <address@hidden>
 
        * procedure.c (case_limit_trns_proc): Fixed buglet which rendered the