Change explicit variable name checks into use of dict_class_from_id().

[pspp] / src / autorecode.c

diff --git a/src/autorecode.c b/src/autorecode.c
index edc07701b2bf59a4f275101101819cb1684a5583..27fe0db2ded776f463442aa0fe8c6eaaf235409d 100644 (file)
--- a/src/autorecode.c
+++ b/src/autorecode.c
@@ -74,8 +74,8 @@ static struct pool *hash_pool;
 static int descend;
 static int print;
 
-static int autorecode_trns_proc (struct trns_header *, struct ccase *);
-static void autorecode_trns_free (struct trns_header *);
+static trns_proc_func autorecode_trns_proc;
+static trns_free_func autorecode_trns_free;
 static int autorecode_proc_func (struct ccase *, void *);
 static hsh_compare_func compare_alpha_value, compare_numeric_value;
 static hsh_hash_func hash_alpha_value, hash_numeric_value;
@@ -157,8 +157,8 @@ cmd_autorecode (void)
 
   for (i = 0; i < nv_dest; i++)
     {
-      v_dest[i] = dict_create_var (default_dict, n_dest[i], 0);
-      assert (v_dest[i] != NULL);
+      v_dest[i] = dict_create_var_assert (default_dict, n_dest[i], 0);
+      v_dest[i]->init = 0;
       free (n_dest[i]);
     }
   free (n_dest);
@@ -235,7 +235,8 @@ recode (void)
 }
 
 static int
-autorecode_trns_proc (struct trns_header * trns, struct ccase * c)
+autorecode_trns_proc (struct trns_header * trns, struct ccase * c,
+                      int case_num UNUSED)
 {
   struct autorecode_trns *t = (struct autorecode_trns *) trns;
   int i;