X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdata%2Fcasereader-project.c;h=2798eeb80cdfe4fa23f63275d21005dfb7ba25e9;hb=c1b1583b96cc05a2bf9f3f6d01bbfa063fafb253;hp=116a3359b4408caf2a51912a45095ea3ffb5843d;hpb=8b71948cd57dbd2787cb4c50525b957e9be8a62b;p=pspp diff --git a/src/data/casereader-project.c b/src/data/casereader-project.c index 116a3359b4..2798eeb80c 100644 --- a/src/data/casereader-project.c +++ b/src/data/casereader-project.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2009 Free Software Foundation, Inc. + Copyright (C) 2009, 2011 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -16,8 +16,8 @@ #include -#include -#include +#include "data/casereader-provider.h" +#include "data/subcase.h" #include "gl/xalloc.h" @@ -57,8 +57,8 @@ static bool destroy_projection (void *project_) { struct casereader_project *project = project_; - subcase_destroy (&project->old_sc); - subcase_destroy (&project->new_sc); + subcase_uninit (&project->old_sc); + subcase_uninit (&project->new_sc); free (project); return true; } @@ -99,7 +99,7 @@ casereader_project_1 (struct casereader *subreader, int column) subcase_init (&sc, column, caseproto_get_width (subproto, column), SC_ASCEND); reader = casereader_project (subreader, &sc); - subcase_destroy (&sc); + subcase_uninit (&sc); return reader; }