projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added design_matrix_clone() to clone a design matrix.
[pspp]
/
src
/
data
/
procedure.c
diff --git
a/src/data/procedure.c
b/src/data/procedure.c
index f280b6828a314b20a7e6a3c912fcab9f29da23d5..98414a2b0478dbb5e44f306e0f99d90684b86003 100644
(file)
--- a/
src/data/procedure.c
+++ b/
src/data/procedure.c
@@
-32,12
+32,12
@@
#include <data/procedure.h>
#include <data/transformations.h>
#include <data/variable.h>
#include <data/procedure.h>
#include <data/transformations.h>
#include <data/variable.h>
-#include <libpspp/alloc.h>
#include <libpspp/deque.h>
#include <libpspp/misc.h>
#include <libpspp/str.h>
#include <libpspp/taint.h>
#include <libpspp/deque.h>
#include <libpspp/misc.h>
#include <libpspp/str.h>
#include <libpspp/taint.h>
+#include "xalloc.h"
struct dataset {
/* Cases are read from source,
struct dataset {
/* Cases are read from source,
@@
-137,7
+137,7
@@
proc_execute (struct dataset *ds)
return proc_commit (ds) && ok;
}
return proc_commit (ds) && ok;
}
-static struct casereader_class proc_casereader_class;
+static
const
struct casereader_class proc_casereader_class;
/* Opens dataset DS for reading cases with proc_read.
proc_commit must be called when done. */
/* Opens dataset DS for reading cases with proc_read.
proc_commit must be called when done. */
@@
-344,7
+344,7
@@
proc_commit (struct dataset *ds)
}
/* Casereader class for procedure execution. */
}
/* Casereader class for procedure execution. */
-static struct casereader_class proc_casereader_class =
+static
const
struct casereader_class proc_casereader_class =
{
proc_casereader_read,
proc_casereader_destroy,
{
proc_casereader_read,
proc_casereader_destroy,
@@
-664,10
+664,10
@@
static trns_free_func case_limit_trns_free;
static void
add_case_limit_trns (struct dataset *ds)
{
static void
add_case_limit_trns (struct dataset *ds)
{
-
size_t
case_limit = dict_get_case_limit (ds->dict);
+
casenumber
case_limit = dict_get_case_limit (ds->dict);
if (case_limit != 0)
{
if (case_limit != 0)
{
-
size_t
*cases_remaining = xmalloc (sizeof *cases_remaining);
+
casenumber
*cases_remaining = xmalloc (sizeof *cases_remaining);
*cases_remaining = case_limit;
add_transformation (ds, case_limit_trns_proc, case_limit_trns_free,
cases_remaining);
*cases_remaining = case_limit;
add_transformation (ds, case_limit_trns_proc, case_limit_trns_free,
cases_remaining);