Remove some unnecessary #include directives

[pspp-builds.git] / src / data / variable.c

diff --git a/src/data/variable.c b/src/data/variable.c
index a60adcafcd8d25422f7be32d8f870059c2c028f3..5ebd6e41231186701f0ea933867f8a0ecd085aa9 100644 (file)
--- a/src/data/variable.c
+++ b/src/data/variable.c
@@ -20,7 +20,6 @@
 #include <stdlib.h>
 
 #include <data/attributes.h>
-#include <data/category.h>
 #include <data/data-out.h>
 #include <data/format.h>
 #include <data/dictionary.h>
@@ -494,7 +493,7 @@ var_is_num_missing (const struct variable *v, double d, enum mv_class class)
    S[] must contain exactly as many characters as V's width.
    V must be a string variable. */
 bool
-var_is_str_missing (const struct variable *v, const char s[],
+var_is_str_missing (const struct variable *v, const uint8_t s[],
                     enum mv_class class)
 {
   return mv_is_str_missing (&v->miss, s, class);
@@ -590,9 +589,10 @@ 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, &v->print);
+      char *s = data_out (value, dict_get_encoding (dict), &v->print);
       ds_put_cstr (str, s);
       free (s);
     }