projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
More tests for totals and subtotals, with fixes.
[pspp]
/
src
/
data
/
any-reader.c
diff --git
a/src/data/any-reader.c
b/src/data/any-reader.c
index ff7f4ab6c923a4dd7bec8ea3e425e5523262b2bd..5a20ccef8360d6cd7f6c225afc5b3feb7a972330 100644
(file)
--- a/
src/data/any-reader.c
+++ b/
src/data/any-reader.c
@@
-129,6
+129,10
@@
any_reader_open (struct file_handle *handle)
NOT_REACHED ();
}
NOT_REACHED ();
}
+/* gnulib on some systems defines "close" as something else,
+ which causes problems for this code. So undefine it here. */
+#undef close
+
bool
any_reader_close (struct any_reader *any_reader)
{
bool
any_reader_close (struct any_reader *any_reader)
{
@@
-222,7
+226,7
@@
static bool
dataset_reader_close (struct any_reader *r_)
{
struct dataset_reader *r = dataset_reader_cast (r_);
dataset_reader_close (struct any_reader *r_)
{
struct dataset_reader *r = dataset_reader_cast (r_);
- dict_
destroy
(r->dict);
+ dict_
unref
(r->dict);
casereader_destroy (r->reader);
free (r);
casereader_destroy (r->reader);
free (r);
@@
-244,7
+248,7
@@
dataset_reader_decode (struct any_reader *r_, const char *encoding UNUSED,
info->integer_format = INTEGER_NATIVE;
info->float_format = FLOAT_NATIVE_DOUBLE;
info->compression = ANY_COMP_NONE;
info->integer_format = INTEGER_NATIVE;
info->float_format = FLOAT_NATIVE_DOUBLE;
info->compression = ANY_COMP_NONE;
- info->
case_cnt = casereader_get_case_cnt
(reader);
+ info->
n_cases = casereader_get_n_cases
(reader);
}
free (r);
}
free (r);