variable: Introduce and use new function var_get_encoding().

[pspp] / src / data / variable.c

diff --git a/src/data/variable.c b/src/data/variable.c
index 05edc57e2db85a3c02df4fbe3a16a6747d92c4bc..79925fa8cbfb00dd4c47c66e085fab1a12162fb3 100644 (file)
--- a/src/data/variable.c
+++ b/src/data/variable.c
@@ -590,10 +590,9 @@ var_append_value_name (const struct variable *v, const union value *value,
                       struct string *str)
 {
   const char *name = var_lookup_value_label (v, value);
-  const struct dictionary *dict = var_get_vardict (v)->dict;
   if (name == NULL)
     {
-      char *s = data_out (value, dict_get_encoding (dict), &v->print);
+      char *s = data_out (value, var_get_encoding (v), &v->print);
       ds_put_cstr (str, s);
       free (s);
     }
@@ -1053,6 +1052,15 @@ var_has_attributes (const struct variable *v)
   return attrset_count (&v->attributes) > 0;
 }
 \f
+/* Returns the encoding of values of variable VAR.  (This is actually a
+   property of the dictionary.)  Returns null if no specific encoding has been
+   set.  */
+const char *
+var_get_encoding (const struct variable *var)
+{
+  return var_has_vardict (var) ? dict_get_encoding (var->vardict.dict) : NULL;
+}
+\f
 /* Returns V's vardict structure. */
 const struct vardict_info *
 var_get_vardict (const struct variable *v)