projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Continue reforming procedure execution. In this phase, add `const' to
[pspp-builds.git]
/
src
/
language
/
data-io
/
matrix-data.c
diff --git
a/src/language/data-io/matrix-data.c
b/src/language/data-io/matrix-data.c
index eb2d226f29341bbe4933f3219f8ca005c98bd941..d5b489c34cd1dac103bd7fc492d8b89949aa9a19 100644
(file)
--- a/
src/language/data-io/matrix-data.c
+++ b/
src/language/data-io/matrix-data.c
@@
-27,6
+27,7
@@
#include <data/case.h>
#include <data/data-in.h>
#include <data/dictionary.h>
#include <data/case.h>
#include <data/data-in.h>
#include <data/dictionary.h>
+#include <data/procedure.h>
#include <data/variable.h>
#include <language/command.h>
#include <language/data-io/data-reader.h>
#include <data/variable.h>
#include <language/command.h>
#include <language/data-io/data-reader.h>
@@
-40,7
+41,6
@@
#include <libpspp/misc.h>
#include <libpspp/pool.h>
#include <libpspp/str.h>
#include <libpspp/misc.h>
#include <libpspp/pool.h>
#include <libpspp/str.h>
-#include <procedure.h>
#include "gettext.h"
#define _(msgid) gettext (msgid)
#include "gettext.h"
#define _(msgid) gettext (msgid)
@@
-972,7
+972,8
@@
read_matrices_without_rowtype (struct matrix_data_pgm *mx)
nr.split_values = xnmalloc (dict_get_split_cnt (default_dict),
sizeof *nr.split_values);
nr.split_values = xnmalloc (dict_get_split_cnt (default_dict),
sizeof *nr.split_values);
- vfm_source = create_case_source (&matrix_data_without_rowtype_source_class, &nr);
+ proc_set_source (create_case_source (
+ &matrix_data_without_rowtype_source_class, &nr));
ok = procedure (NULL, NULL);
ok = procedure (NULL, NULL);
@@
-1512,8
+1513,8
@@
read_matrices_with_rowtype (struct matrix_data_pgm *mx)
wr.current = NULL;
mx->cells = 0;
wr.current = NULL;
mx->cells = 0;
-
vfm_source =
create_case_source (&matrix_data_with_rowtype_source_class,
-
&wr
);
+
proc_set_source (
create_case_source (&matrix_data_with_rowtype_source_class,
+
&wr)
);
ok = procedure (NULL, NULL);
free (wr.split_values);
ok = procedure (NULL, NULL);
free (wr.split_values);