projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(close_active_file) Remove unnecessary test.
[pspp]
/
src
/
get.c
diff --git
a/src/get.c
b/src/get.c
index 3300ae6457d717c6b3d14eabd0753d676b9f6b1c..32602b35c66907565d0e81cb0e857fbacfcb7fa2 100644
(file)
--- a/
src/get.c
+++ b/
src/get.c
@@
-887,6
+887,7
@@
cmd_match_files (void)
}
}
}
}
}
}
+ free (by);
}
else if (lex_match_id ("FIRST"))
{
}
else if (lex_match_id ("FIRST"))
{
@@
-1030,7
+1031,7
@@
cmd_match_files (void)
if (mtf.sink->class->open != NULL)
mtf.sink->class->open (mtf.sink);
if (mtf.sink->class->open != NULL)
mtf.sink->class->open (mtf.sink);
- mtf.seq_nums = xcalloc (dict_get_var_cnt (mtf.dict)
*
sizeof *mtf.seq_nums);
+ mtf.seq_nums = xcalloc (dict_get_var_cnt (mtf.dict)
,
sizeof *mtf.seq_nums);
case_create (&mtf.mtf_case, dict_get_next_value_idx (mtf.dict));
mtf_read_nonactive_records (&mtf);
case_create (&mtf.mtf_case, dict_get_next_value_idx (mtf.dict));
mtf_read_nonactive_records (&mtf);
@@
-1038,6
+1039,9
@@
cmd_match_files (void)
procedure (mtf_processing, &mtf);
mtf_processing_finish (&mtf);
procedure (mtf_processing, &mtf);
mtf_processing_finish (&mtf);
+ free_case_source (vfm_source);
+ vfm_source = NULL;
+
dict_destroy (default_dict);
default_dict = mtf.dict;
mtf.dict = NULL;
dict_destroy (default_dict);
default_dict = mtf.dict;
mtf.dict = NULL;
@@
-1201,7
+1205,9
@@
mtf_processing (struct ccase *c, void *mtf_)
bool read_active_file;
assert (mtf->head != NULL);
bool read_active_file;
assert (mtf->head != NULL);
- assert (mtf->head->type == MTF_FILE);
+ if (mtf->head->type == MTF_TABLE)
+ return 1;
+
do
{
struct mtf_file *min_head, *min_tail; /* Files with minimum BY values. */
do
{
struct mtf_file *min_head, *min_tail; /* Files with minimum BY values. */