X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdata%2Fdictionary.c;h=c8840f302beebc06d8ccc0ec8abc37aeb502550e;hb=393668423c1c9456fd82db6b30f25de078915da5;hp=161071ec159a038555da3467ef8586a07a143fa3;hpb=c646c399bf8c942a5e33abaa6c12336429c09f24;p=pspp-builds.git diff --git a/src/data/dictionary.c b/src/data/dictionary.c index 161071ec..c8840f30 100644 --- a/src/data/dictionary.c +++ b/src/data/dictionary.c @@ -270,7 +270,7 @@ dict_create_var (struct dictionary *d, const char *name, int width) assert (d != NULL); assert (name != NULL); - assert (width >= 0 && width < 256); + assert (width >= 0 && width <= MAX_STRING); assert (var_is_plausible_name(name,0)); @@ -284,7 +284,7 @@ dict_create_var (struct dictionary *d, const char *name, int width) v->type = width == 0 ? NUMERIC : ALPHA; v->width = width; v->fv = d->next_value_idx; - v->nv = width == 0 ? 1 : DIV_RND_UP (width, 8); + v->nv = width_to_bytes(width) / MAX_SHORT_STRING ; v->leave = dict_class_from_id (v->name) == DC_SCRATCH; v->index = d->var_cnt; mv_init (&v->miss, width);