Finish converting struct variable to an opaque type. In this

[pspp-builds.git] / src / ui / gui / helper.c

diff --git a/src/ui/gui/helper.c b/src/ui/gui/helper.c
index 841bda5a96706411ef24198fe25320c87dcc3722..d60a01ac12fce9092228675a20bedcce8fd837b1 100644 (file)
--- a/src/ui/gui/helper.c
+++ b/src/ui/gui/helper.c
@@ -1,5 +1,8 @@
+#include <config.h>
+
 #include "helper.h"
 #include <data/data-in.h>
+#include <data/data-out.h>
 #include <libpspp/message.h>
 
 #include <libpspp/i18n.h>
@@ -16,10 +19,7 @@ value_to_text(union value v, struct fmt_spec format)
   gchar *s = 0;
 
   s = g_new(gchar, format.w + 1);
-  if ( ! data_out(s, &format, &v) ) 
-    {
-      g_warning("Can't format missing discrete value \n");
-    }
+  data_out(&v, &format, s);
   s[format.w]='\0';
   g_strchug(s);
 
@@ -32,7 +32,7 @@ gboolean
 text_to_value(const gchar *text, union value *v, 
              struct fmt_spec format)
 {
-  struct data_in di;
+  bool ok;
 
   if ( format.type != FMT_A) 
     {
@@ -51,15 +51,12 @@ text_to_value(const gchar *text, union value *v,
       }
     }
 
-  di.s = text;
-  di.e = text + strlen(text);
-  di.v = v;
-  di.flags = DI_IGNORE_ERROR;
-  di.f1 = di.f2 = 0;
-  di.format = format;
-  
-  return data_in(&di);
+  msg_disable ();
+  ok = data_in (ss_cstr (text), format.type, 0, 0,
+                v, fmt_var_width (&format));
+  msg_enable ();
 
+  return ok;
 }