projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dataset: Rename functions with "dataset_" prefix.
[pspp-builds.git]
/
src
/
language
/
data-io
/
combine-files.c
diff --git
a/src/language/data-io/combine-files.c
b/src/language/data-io/combine-files.c
index a661d7c6cde3d55afabd245f582b643b479ba303..c290692e98a98ab95562608eb476b9d4bdea55c3 100644
(file)
--- a/
src/language/data-io/combine-files.c
+++ b/
src/language/data-io/combine-files.c
@@
-206,7
+206,7
@@
combine_files (enum comb_command_type command,
if (lex_match (lexer, T_ASTERISK))
{
if (lex_match (lexer, T_ASTERISK))
{
- if (!
proc_has_active_fil
e (ds))
+ if (!
dataset_has_sourc
e (ds))
{
msg (SE, _("Cannot specify the active file since no active "
"file has been defined."));
{
msg (SE, _("Cannot specify the active file since no active "
"file has been defined."));
@@
-466,7
+466,8
@@
combine_files (enum comb_command_type command,
if (active_file != NULL)
proc_commit (ds);
if (active_file != NULL)
proc_commit (ds);
- proc_set_active_file (ds, casewriter_make_reader (proc.output), proc.dict);
+ dataset_set_dict (ds, proc.dict);
+ dataset_set_source (ds, casewriter_make_reader (proc.output));
proc.dict = NULL;
proc.output = NULL;
proc.dict = NULL;
proc.output = NULL;