- + sizeof (flt64) * (avl_count (v->val_lab) - 1));
- while (NULL != (vl = avl_traverse (v->val_lab, &i)))
- vlr_size += ROUND_UP (strlen (vl->s) + 1, sizeof (flt64));
+ + sizeof (flt64) * (val_labs_count (v->val_labs) - 1));
+ for (vl = val_labs_first (v->val_labs, &i); vl != NULL;
+ vl = val_labs_next (v->val_labs, &i))
+ vlr_size += ROUND_UP (strlen (vl->label) + 1, sizeof (flt64));