X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdata%2Fcasereader.c;h=41d0ca473a8e52eb614fa1f72d0acc01a2ff49ac;hb=08767a7c0d9b6f719c307baa8d264f989a65d7a3;hp=e50096f5e8cc10980ec93b5b682042072466d2c9;hpb=8870ca57b746c93b91fb740927fcda45643499d2;p=pspp diff --git a/src/data/casereader.c b/src/data/casereader.c index e50096f5e8..41d0ca473a 100644 --- a/src/data/casereader.c +++ b/src/data/casereader.c @@ -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; } @@ -107,7 +107,7 @@ casereader_clone (const struct casereader *reader_) { struct casereader *reader = CONST_CAST (struct casereader *, reader_); struct casereader *clone; - if ( reader == NULL ) + if ( reader == NULL ) return NULL; if (reader->class->clone == NULL) @@ -239,12 +239,13 @@ static casenumber casereader_count_cases__ (const struct casereader *reader, casenumber max_cases) { - struct casereader *clone = casereader_clone (reader); - casenumber n_cases = casereader_advance (clone, max_cases); -#if (__GNUC__ == 4 ) && (__GNUC_MINOR__ == 4) - // volatile int x = 1; -#endif - // casereader_destroy (clone); + struct casereader *clone; + casenumber n_cases; + + clone = casereader_clone (reader); + n_cases = casereader_advance (clone, max_cases); + casereader_destroy (clone); + return n_cases; }