struct all_dict_variables
all_variables (struct dictionary *dict)
{
- size_t n_vars = dict_get_var_cnt (dict);
+ size_t n_vars = dict_get_n_vars (dict);
/* Start with a set of all variable names. */
struct string_set var_names = STRING_SET_INITIALIZER (var_names);
size_t var_count = n_sets + string_set_count (&var_names);
/* Allocate an array of var_or_mrset pointers (initially null). */
- struct var_or_mrset *var_or_mrset_array = xcalloc (
- var_count, sizeof *var_or_mrset_array);
+ struct var_or_mrset *var_or_mrset_array
+ = XCALLOC (var_count, struct var_or_mrset);
/* Fill the array. */
struct string_set added_mrsets = STRING_SET_INITIALIZER (added_mrsets);
XXX only checking "user" here because not sure of correct other
cases. */
- if (var_is_value_missing (var, value, MV_USER))
- write_attr (writer, "missing", "user");
- else if (var_is_value_missing (var, value, MV_SYSTEM))
- write_attr (writer, "missing", "system");
+ enum mv_class miss = var_is_value_missing (var, value);
+ if (miss)
+ write_attr (writer, "missing", miss == MV_USER ? "user" : "system");
/* <properties/> */
xmlTextWriterStartElement (writer, _xml ("properties"));
mdd_write (struct file_handle *fh, struct dictionary *dict,
const char *sav_name)
{
- struct mdd_writer *w = xzalloc (sizeof *w);
- size_t n_vars = dict_get_var_cnt (dict);
+ struct mdd_writer *w = XZALLOC (struct mdd_writer);
+ size_t n_vars = dict_get_n_vars (dict);
/* Open file handle as an exclusive writer. */
/* TRANSLATORS: this fragment will be interpolated into
/* We reserve ids 1...N_VARS for variables and then start other ids after
that. */
- int id = dict_get_var_cnt (dict) + 1;
+ int id = dict_get_n_vars (dict) + 1;
/* <definition/> */
xmlTextWriterStartElement (w->writer, _xml ("definition"));