projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix some typos (found by codespell)
[pspp]
/
src
/
data
/
casereader-translator.c
diff --git
a/src/data/casereader-translator.c
b/src/data/casereader-translator.c
index 27ea413460aa501a61d4d81ae97a9c9c8f1d50df..d3388aa68b4d98ca3b69052338a412651aa9d5f3 100644
(file)
--- a/
src/data/casereader-translator.c
+++ b/
src/data/casereader-translator.c
@@
-1,5
+1,5
@@
/* PSPP - a program for statistical analysis.
/* 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
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 <http://www.gnu.org/licenses/>. */
#include <config.h>
along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include <config.h>
-#include <data/val-type.h>
-#include <data/casereader.h>
+
#include <stdlib.h>
#include <stdlib.h>
-#include <data/variable.h>
-#include <data/casereader-provider.h>
-#include <libpspp/taint.h>
+#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. */
/* Casereader that applies a user-supplied function to translate
each case into another in an arbitrary fashion. */
@@
-356,7
+357,7
@@
static struct ccase *car_translate (struct ccase *input, void *car_);
If DISTINCT_CALLBACK is non-null, then it will be called exactly
once for every case containing a distinct value of V. AUX is
If DISTINCT_CALLBACK is non-null, then it will be called exactly
once for every case containing a distinct value of V. AUX is
- an auxil
l
iary pointer passed to DISTINCT_CALLBACK.
+ an auxiliary pointer passed to DISTINCT_CALLBACK.
After this function is called, SUBREADER must not ever again
be referenced directly. It will be destroyed automatically
After this function is called, SUBREADER must not ever again
be referenced directly. It will be destroyed automatically
@@
-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 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 ++;
int dir = 0;
cdr->n ++;
@@
-498,9
+499,10
@@
uniquify (const struct ccase *c, void *aux)
if ( NULL == next_case)
goto end;
if ( NULL == next_case)
goto end;
-
+
dir = value_compare_3way (case_data (next_case, cdr->key),
current_value, key_width);
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 */
if ( dir != 0 )
{
/* Insist that the data are sorted */
@@
-508,7
+510,7
@@
uniquify (const struct ccase *c, void *aux)
cdr->direction = dir;
goto end;
}
cdr->direction = dir;
goto end;
}
-
+
return false;
end:
return false;
end:
@@
-533,7
+535,7
@@
consolodate_weight (struct ccase *input, void *aux)
else
{
c = case_unshare_and_resize (input, cdr->proto);
else
{
c = case_unshare_and_resize (input, cdr->proto);
- case_data_rw_idx (c, caseproto_get_n_widths (cdr->proto) - 1)->f = cdr->prev_cc;
+ case_data_rw_idx (c, caseproto_get_n_widths (cdr->proto) - 1)->f = cdr->prev_cc;
}
return c;
}
return c;
@@
-554,7
+556,7
@@
uniquify_destroy (void *aux)
-/* Returns a new casereader which is based upon INPUT, but which contains a maximum
+/* Returns a new casereader which is based upon INPUT, but which contains a maximum
of one case for each distinct value of KEY.
If WEIGHT is non-null, then the new casereader's values for this variable
will be the sum of all values matching KEY.
of one case for each distinct value of KEY.
If WEIGHT is non-null, then the new casereader's values for this variable
will be the sum of all values matching KEY.