[Pspp-cvs] pspp/src/data ChangeLog any-reader.c any-writer.c

[Ben Pfaff]

CVSROOT:        /cvsroot/pspp
Module name:    pspp
Branch:         
Changes by:     Ben Pfaff <address@hidden>      06/03/25 02:16:58

Modified files:
        src/data       : ChangeLog any-reader.c any-writer.c 

Log message:
        Add some missing frees.  Thanks to John Darrington for reporting
        these.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/data/ChangeLog.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/data/any-reader.c.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/data/any-writer.c.diff?tr1=1.2&tr2=1.3&r1=text&r2=text

Patches:
Index: pspp/src/data/ChangeLog
diff -u pspp/src/data/ChangeLog:1.5 pspp/src/data/ChangeLog:1.6
--- pspp/src/data/ChangeLog:1.5 Tue Mar 21 00:34:16 2006
+++ pspp/src/data/ChangeLog     Sat Mar 25 02:16:58 2006
@@ -1,3 +1,12 @@
+Fri Mar 24 18:15:41 2006  Ben Pfaff  <address@hidden>
+
+       Add some missing frees.  Thanks to John Darrington for reporting
+       these.
+
+       * any-writer.c (any_writer_close): Free writer.
+
+       * any-reader.c (any_reader_close): Free reader.
+
 Mon Mar 20 16:33:53 2006  Ben Pfaff  <address@hidden>
 
        * por-file-reader.c: (error) Mark as NO_RETURN.
Index: pspp/src/data/any-reader.c
diff -u pspp/src/data/any-reader.c:1.2 pspp/src/data/any-reader.c:1.3
--- pspp/src/data/any-reader.c:1.2      Wed Mar 15 03:29:10 2006
+++ pspp/src/data/any-reader.c  Sat Mar 25 02:16:58 2006
@@ -204,4 +204,6 @@
     default:
       abort ();
     }
+
+  free (reader);
 }
Index: pspp/src/data/any-writer.c
diff -u pspp/src/data/any-writer.c:1.2 pspp/src/data/any-writer.c:1.3
--- pspp/src/data/any-writer.c:1.2      Wed Mar 15 03:29:10 2006
+++ pspp/src/data/any-writer.c  Sat Mar 25 02:16:58 2006
@@ -189,21 +189,29 @@
 bool
 any_writer_close (struct any_writer *writer) 
 {
+  bool ok;
+  
   if (writer == NULL)
     return true;
 
   switch (writer->type) 
     {
     case SYSTEM_FILE:
-      return sfm_close_writer (writer->private);
+      ok = sfm_close_writer (writer->private);
+      break;
 
     case PORTABLE_FILE:
-      return pfm_close_writer (writer->private);
+      ok = pfm_close_writer (writer->private);
+      break;
 
     case SCRATCH_FILE:
-      return scratch_writer_close (writer->private);
-
+      ok = scratch_writer_close (writer->private);
+      break;
+      
     default:
       abort ();
     }
+
+  free (writer);
+  return ok;
 }