X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdata%2Fcasereader-translator.c;h=062184691defe569321351b5f1304709fcfb2273;hb=81579d9e9f994fb2908f50af41c3eb033d216e58;hp=27ea413460aa501a61d4d81ae97a9c9c8f1d50df;hpb=7c08a6e1009cf60847e770a77a73c650e9326379;p=pspp-builds.git diff --git a/src/data/casereader-translator.c b/src/data/casereader-translator.c index 27ea4134..06218469 100644 --- a/src/data/casereader-translator.c +++ b/src/data/casereader-translator.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2007, 2009 Free Software Foundation, Inc. + Copyright (C) 2007, 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 @@ -15,15 +15,16 @@ along with this program. If not, see . */ #include -#include -#include + #include -#include -#include -#include +#include "data/casereader-provider.h" +#include "data/casereader.h" +#include "data/val-type.h" +#include "data/variable.h" +#include "libpspp/taint.h" -#include "xalloc.h" +#include "gl/xalloc.h" /* Casereader that applies a user-supplied function to translate each case into another in an arbitrary fashion. */ @@ -490,7 +491,7 @@ uniquify (const struct ccase *c, void *aux) const union value *current_value = case_data (c, cdr->key); const int key_width = var_get_width (cdr->key); const double weight = cdr->weight ? case_data (c, cdr->weight)->f : 1.0; - const struct ccase *next_case = casereader_peek (cdr->clone, cdr->n + 1); + struct ccase *next_case = casereader_peek (cdr->clone, cdr->n + 1); int dir = 0; cdr->n ++; @@ -501,6 +502,7 @@ uniquify (const struct ccase *c, void *aux) dir = value_compare_3way (case_data (next_case, cdr->key), current_value, key_width); + case_unref (next_case); if ( dir != 0 ) { /* Insist that the data are sorted */