Commit remaining bits

[pspp] / src / data / casereader.c

diff --git a/src/data/casereader.c b/src/data/casereader.c
index e50096f5e8cc10980ec93b5b682042072466d2c9..37adbb37d605c1399051fc98a84e433e6b90d1ee 100644 (file)
--- a/src/data/casereader.c
+++ b/src/data/casereader.c
@@ -1,4 +1,4 @@
-/* PSPP - a program for statistical analysis.
+/* pspp - a program for statistical analysis.
    Copyright (C) 2007, 2009, 2010, 2013 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
@@ -91,10 +91,10 @@ casereader_destroy (struct casereader *reader)
   bool ok = true;
   if (reader != NULL)
     {
-      //      reader->class->destroy (reader, reader->aux);
-      // ok = taint_destroy (reader->taint);
-      // caseproto_unref (reader->proto);
-      //  free (reader);
+      reader->class->destroy (reader, reader->aux);
+      ok = taint_destroy (reader->taint);
+      caseproto_unref (reader->proto);
+      free (reader);
     }
   return ok;
 }
@@ -242,9 +242,9 @@ casereader_count_cases__ (const struct casereader *reader,
   struct casereader *clone = casereader_clone (reader);
   casenumber n_cases = casereader_advance (clone, max_cases);
 #if (__GNUC__ == 4 ) && (__GNUC_MINOR__ == 4)
-  // volatile int x = 1;
+  volatile int x = 1; x++;
 #endif
-  //  casereader_destroy (clone);
+  casereader_destroy (clone);
   return n_cases;
 }