X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdata%2Fdictionary.c;h=ad5b50671fa6f2a9d138d064adb3ac2c40944ed8;hb=2989bae3e4d22437b6f225385f70423851612a2a;hp=d2d93c3bd2f535d59dac071f0ce4fbe2f57d7772;hpb=985c40f2a83588b25f0e6fe7f7d82863c5d34d43;p=pspp diff --git a/src/data/dictionary.c b/src/data/dictionary.c index d2d93c3bd2..ad5b50671f 100644 --- a/src/data/dictionary.c +++ b/src/data/dictionary.c @@ -282,8 +282,7 @@ dict_create_var (struct dictionary *d, const char *name, int width) v->width = width; v->fv = d->next_value_idx; v->nv = width == 0 ? 1 : DIV_RND_UP (width, 8); - v->init = 1; - v->reinit = dict_class_from_id (v->name) != DC_SCRATCH; + v->leave = dict_class_from_id (v->name) == DC_SCRATCH; v->index = d->var_cnt; mv_init (&v->miss, width); if (v->type == NUMERIC) @@ -359,8 +358,7 @@ dict_clone_var (struct dictionary *d, const struct variable *ov, short_name[] is intentionally not copied, because there is no reason to give a new variable with potentially a new name the same short name. */ - nv->init = 1; - nv->reinit = ov->reinit; + nv->leave = ov->leave; mv_copy (&nv->miss, &ov->miss); nv->print = ov->print; nv->write = ov->write;