X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdata%2Fprocedure.c;h=98414a2b0478dbb5e44f306e0f99d90684b86003;hb=cf75e794a54ba92f57d71b236de555fcc1d5877e;hp=f280b6828a314b20a7e6a3c912fcab9f29da23d5;hpb=d96e59d1c5f17bd3b4b3b757640851731fde3c78;p=pspp-builds.git

diff --git a/src/data/procedure.c b/src/data/procedure.c
index f280b682..98414a2b 100644
--- 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 <libpspp/alloc.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,
@@ -137,7 +137,7 @@ proc_execute (struct dataset *ds)
   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. */
@@ -344,7 +344,7 @@ proc_commit (struct dataset *ds)
 }
 
 /* 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,
@@ -664,10 +664,10 @@ static trns_free_func case_limit_trns_free;
 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)
     {
-      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);