struct init_list
{
struct init_value *values;
- size_t cnt;
+ size_t n;
};
/* A bitmap of the "left" status of variables. */
init_list_create (struct init_list *list)
{
list->values = NULL;
- list->cnt = 0;
+ list->n = 0;
}
/* Initializes NEW as a copy of OLD. */
{
size_t i;
- new->values = xmemdup (old->values, old->cnt * sizeof *old->values);
- new->cnt = old->cnt;
+ new->values = xmemdup (old->values, old->n * sizeof *old->values);
+ new->n = old->n;
- for (i = 0; i < new->cnt; i++)
+ for (i = 0; i < new->n; i++)
{
struct init_value *iv = &new->values[i];
value_clone (&iv->value, &iv->value, iv->width);
{
struct init_value *iv;
- for (iv = &list->values[0]; iv < &list->values[list->cnt]; iv++)
+ for (iv = &list->values[0]; iv < &list->values[list->n]; iv++)
value_destroy (&iv->value, iv->width);
free (list->values);
}
{
struct init_value value;
value.case_index = case_index;
- return binary_search (list->values, list->cnt, sizeof *list->values,
+ return binary_search (list->values, list->n, sizeof *list->values,
&value, compare_init_values, NULL) != NULL;
}
init_list_mark (struct init_list *list, const struct init_list *exclude,
enum leave_class include, const struct dictionary *d)
{
- size_t var_cnt = dict_get_var_cnt (d);
- size_t i;
+ size_t n_vars = dict_get_n_vars (d);
assert (list != exclude);
- list->values = xnrealloc (list->values, list->cnt + dict_get_var_cnt (d),
+ list->values = xnrealloc (list->values, list->n + dict_get_n_vars (d),
sizeof *list->values);
- for (i = 0; i < var_cnt; i++)
+ for (size_t i = 0; i < n_vars; i++)
{
struct variable *v = dict_get_var (d, i);
size_t case_index = var_get_case_index (v);
if (exclude != NULL && init_list_includes (exclude, case_index))
continue;
- iv = &list->values[list->cnt++];
+ iv = &list->values[list->n++];
iv->case_index = case_index;
iv->width = var_get_width (v);
value_init (&iv->value, iv->width);
}
/* Drop duplicates. */
- list->cnt = sort_unique (list->values, list->cnt, sizeof *list->values,
- compare_init_values, NULL);
+ list->n = sort_unique (list->values, list->n, sizeof *list->values,
+ compare_init_values, NULL);
}
/* Initializes data in case C to the values in the initializer
{
const struct init_value *iv;
- for (iv = &list->values[0]; iv < &list->values[list->cnt]; iv++)
+ for (iv = &list->values[0]; iv < &list->values[list->n]; iv++)
value_copy (case_data_rw_idx (c, iv->case_index), &iv->value, iv->width);
}
{
struct init_value *iv;
- for (iv = &list->values[0]; iv < &list->values[list->cnt]; iv++)
+ for (iv = &list->values[0]; iv < &list->values[list->n]; iv++)
value_copy (&iv->value, case_data_idx (c, iv->case_index), iv->width);
}
\f