X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fautorecode.c;h=27fe0db2ded776f463442aa0fe8c6eaaf235409d;hb=42b39a3f442bbe61d6b31cb4e07ba4d6c8b4b1f8;hp=c487255ffe6048d2f858c9632129eca90cfc26d3;hpb=7b98b3a4f58f6dc5a8e9cbc188b627966d5e652d;p=pspp diff --git a/src/autorecode.c b/src/autorecode.c index c487255ffe..27fe0db2de 100644 --- a/src/autorecode.c +++ b/src/autorecode.c @@ -74,9 +74,9 @@ 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 int autorecode_proc_func (struct ccase *); +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; static void recode (void); @@ -153,12 +153,12 @@ cmd_autorecode (void) h_trans[i] = hsh_create (10, compare_numeric_value, hash_numeric_value, NULL, NULL); - procedure (NULL, autorecode_proc_func, NULL); + procedure (NULL, autorecode_proc_func, NULL, NULL); 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; @@ -309,7 +310,7 @@ hash_numeric_value (const void *a_, void *foo UNUSED) } static int -autorecode_proc_func (struct ccase * c) +autorecode_proc_func (struct ccase *c, void *aux UNUSED) { int i;