treewide: Replace <name>_cnt by n_<name>s and <name>_cap by allocated_<name>.

[pspp] / src / data / mdd-writer.c

diff --git a/src/data/mdd-writer.c b/src/data/mdd-writer.c
index 495be8cafea8c1127eab718bec0209eee6110936..3fd651eb01afb2aafbdadf1754e9a1edc8a9f0f7 100644 (file)
--- a/src/data/mdd-writer.c
+++ b/src/data/mdd-writer.c
@@ -122,7 +122,7 @@ all_variables (struct dictionary *dict);
 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);
@@ -148,8 +148,8 @@ all_variables (struct dictionary *dict)
   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);
@@ -288,7 +288,7 @@ write_value_label_value (xmlTextWriter *writer, const struct val_lab *vl,
   const union value *value = val_lab_get_value (vl);
   if (width)
     {
-      char *s = xmemdup0 (value_str (value, width), width);
+      char *s = xmemdup0 (value->s, width);
       xmlTextWriterWriteAttribute (writer, _xml ("value"), _xml (s));
       free (s);
     }
@@ -448,8 +448,8 @@ bool
 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
@@ -624,7 +624,7 @@ mdd_write (struct file_handle *fh, struct dictionary *dict,
 
   /* 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"));