X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fhelper.c;h=ae645a61477bb867a3c70f557cf92ff759ab62d3;hb=bc02bc027697df3207f827de722c26d8cc87e824;hp=841bda5a96706411ef24198fe25320c87dcc3722;hpb=655bf3a3917cdf16f99fcbb680d2bf3159126a93;p=pspp-builds.git

diff --git a/src/ui/gui/helper.c b/src/ui/gui/helper.c
index 841bda5a..ae645a61 100644
--- 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>
@@ -8,80 +11,74 @@
 #include <string.h>
 #include <data/settings.h>
 
-/* Formats a value according to FORMAT 
+/* Formats a value according to FORMAT
    The returned string must be freed when no longer required */
 gchar *
-value_to_text(union value v, struct fmt_spec format)
+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");
-    }
+  s = g_new (gchar, format.w + 1);
+  data_out (&v, &format, s);
   s[format.w]='\0';
-  g_strchug(s);
+  g_strchug (s);
 
   return s;
 }
 
 
 
-gboolean 
-text_to_value(const gchar *text, union value *v, 
+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) 
+  if ( format.type != FMT_A)
     {
       if ( ! text ) return FALSE;
 
       {
 	const gchar *s = text;
-	while(*s) 
+	while (*s)
 	  {
-	    if ( !isspace(*s))
+	    if ( !isspace (*s))
 	      break;
 	    s++;
 	  }
- 
+
 	if ( !*s) return FALSE;
       }
     }
 
-  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;
 }
 
 
 GtkWidget *
-get_widget_assert(GladeXML *xml, const gchar *name)
+get_widget_assert (GladeXML *xml, const gchar *name)
 {
   GtkWidget *w;
-  g_assert(xml);
-  g_assert(name);
-  
-  w = glade_xml_get_widget(xml, name);
+  g_assert (xml);
+  g_assert (name);
+
+  w = glade_xml_get_widget (xml, name);
 
-  if ( !w ) 
-    g_warning("Widget \"%s\" could not be found\n", name);
+  if ( !w )
+    g_warning ("Widget \"%s\" could not be found\n", name);
 
   return w;
 }
 
 /* Converts a string in the pspp locale to utf-8 */
 char *
-pspp_locale_to_utf8(const gchar *text, gssize len, GError **err)
+pspp_locale_to_utf8 (const gchar *text, gssize len, GError **err)
 {
-  return recode_string(CONV_PSPP_TO_UTF8, text, len);
+  return recode_string (CONV_PSPP_TO_UTF8, text, len);
 }