projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Respect the constness of caseproto.
[pspp-builds.git]
/
src
/
data
/
casereader-translator.c
diff --git
a/src/data/casereader-translator.c
b/src/data/casereader-translator.c
index a2963980253790dd5f398cf20fd44420350c26d3..c193d404dcccdf08a1a73c96109ee00c44f9e0ef 100644
(file)
--- a/
src/data/casereader-translator.c
+++ b/
src/data/casereader-translator.c
@@
-417,12
+417,16
@@
consolodate_weight (struct ccase *input, void *aux)
struct consolidator *cdr = aux;
struct ccase *c;
struct consolidator *cdr = aux;
struct ccase *c;
- c = case_unshare_and_resize (input, cdr->proto);
-
if (cdr->weight)
if (cdr->weight)
- case_data_rw (c, cdr->weight)->f = cdr->prev_cc;
+ {
+ c = case_unshare (input);
+ case_data_rw (c, cdr->weight)->f = cdr->prev_cc;
+ }
else
else
- case_data_rw_idx (c, caseproto_get_n_widths (cdr->proto) - 1)->f = cdr->prev_cc;
+ {
+ c = case_unshare_and_resize (input, cdr->proto);
+ case_data_rw_idx (c, caseproto_get_n_widths (cdr->proto) - 1)->f = cdr->prev_cc;
+ }
return c;
}
return c;
}
@@
-457,7
+461,7
@@
casereader_create_distinct (struct casereader *input,
{
struct casereader *u ;
struct casereader *ud ;
{
struct casereader *u ;
struct casereader *ud ;
-
const struct caseproto *output_proto = casereader_get_proto (input
);
+
struct caseproto *output_proto = caseproto_clone (casereader_get_proto (input)
);
struct consolidator *cdr = xmalloc (sizeof (*cdr));
cdr->n = 0;
struct consolidator *cdr = xmalloc (sizeof (*cdr));
cdr->n = 0;
@@
-480,5
+484,7
@@
casereader_create_distinct (struct casereader *input,
consolodate_weight,
uniquify_destroy,
cdr);
consolodate_weight,
uniquify_destroy,
cdr);
+
+ return ud;
}
}