Avoid crash when attempting to open files with invalid encoding

[pspp] / src / ui / gui / var-display.c

diff --git a/src/ui/gui/var-display.c b/src/ui/gui/var-display.c
index 26de981fef7a06a16a8891dc59318b108ba8490f..f779f4b1c15cca22d08b54e694506a6c373ccb99 100644 (file)
--- a/src/ui/gui/var-display.c
+++ b/src/ui/gui/var-display.c
@@ -16,20 +16,9 @@
 static const gchar none[] = N_("None");
 
 
-const gchar *
-measure_to_string (const struct variable *var, GError **err)
-{
-  const gint measure = var_get_measure (var);
-
-  g_assert (measure < n_MEASURES);
-  return gettext (measures[measure]);
-}
-
-
 gchar *
-missing_values_to_string (const PsppireDict *dict, const struct variable *pv, GError **err)
+missing_values_to_string (const struct variable *pv, GError **err)
 {
-  const struct fmt_spec *fmt =  var_get_print_format (pv);
   gchar *s;
   const struct missing_values *miss = var_get_missing_values (pv);
   if ( mv_is_empty (miss))
@@ -44,7 +33,7 @@ missing_values_to_string (const PsppireDict *dict, const struct variable *pv, GE
          gint i;
          for (i = 0 ; i < n; ++i )
            {
-             mv[i] = value_to_text (*mv_get_value (miss, i), dict, *fmt);
+             mv[i] = value_to_text (*mv_get_value (miss, i), pv);
              if ( i > 0 )
                g_string_append (gstr, ", ");
              g_string_append (gstr, mv[i]);
@@ -60,8 +49,8 @@ missing_values_to_string (const PsppireDict *dict, const struct variable *pv, GE
          union value low, high;
          mv_get_range (miss, &low.f, &high.f);
 
-         l = value_to_text (low, dict, *fmt);
-         h = value_to_text (high, dict,*fmt);
+         l = value_to_text (low, pv);
+         h = value_to_text (high, pv);
 
          g_string_printf (gstr, "%s - %s", l, h);
          g_free (l);
@@ -69,9 +58,9 @@ missing_values_to_string (const PsppireDict *dict, const struct variable *pv, GE
 
          if ( mv_has_value (miss))
            {
-             gchar *ss = 0;
+             gchar *ss = NULL;
 
-             ss = value_to_text (*mv_get_value (miss, 0), dict, *fmt);
+             ss = value_to_text (*mv_get_value (miss, 0), pv);
 
              g_string_append (gstr, ", ");
              g_string_append (gstr, ss);