From: Ben Pfaff <blp@cs.stanford.edu>
Date: Sat, 18 Aug 2012 19:17:01 +0000 (-0700)
Subject: gui: Factor new text_to_value__() function out of text_to_value().
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=af8615fd43519dd7ac52794342fb693e51273ba9;p=pspp

gui: Factor new text_to_value__() function out of text_to_value().

I intend to use this in an upcoming commit.
---

diff --git a/src/ui/gui/helper.c b/src/ui/gui/helper.c
index c5f7883913..84df352fdd 100644
--- a/src/ui/gui/helper.c
+++ b/src/ui/gui/helper.c
@@ -118,8 +118,25 @@ text_to_value (const gchar *text,
 	       const struct variable *var,
 	       union value *val)
 {
-  const struct fmt_spec *format = var_get_print_format (var);
-  int width = var_get_width (var);
+  return text_to_value__ (text, var_get_print_format (var),
+                          var_get_encoding (var), val);
+}
+
+/* Converts TEXT, which contains a value in the given FORMAT encoding in
+   ENCODING, into a value.
+
+   VAL will be initialised and filled by this function.
+   It is the caller's responsibility to destroy VAL when no longer needed.
+
+   On success, VAL is returned, NULL otherwise.
+*/
+union value *
+text_to_value__ (const gchar *text,
+                 const struct fmt_spec *format,
+                 const gchar *encoding,
+                 union value *val)
+{
+  int width = fmt_var_width (format);
 
   if ( format->type != FMT_A)
     {
@@ -139,8 +156,7 @@ text_to_value (const gchar *text,
     }
 
   value_init (val, width);
-  free (data_in (ss_cstr (text), UTF8, format->type, val, width,
-                 var_get_encoding (var)));
+  free (data_in (ss_cstr (text), UTF8, format->type, val, width, encoding));
 
   return val;
 }
diff --git a/src/ui/gui/helper.h b/src/ui/gui/helper.h
index be0b1ad480..7431d4c4e3 100644
--- a/src/ui/gui/helper.h
+++ b/src/ui/gui/helper.h
@@ -51,10 +51,10 @@ gchar * value_to_text__ (union value v, const struct fmt_spec *,
                          const char *encoding);
 
 
-union value *
-text_to_value (const gchar *text,
-	       const struct variable *var,
-	       union value *);
+union value *text_to_value (const gchar *text, const struct variable *,
+                            union value *);
+union value *text_to_value__ (const gchar *text, const struct fmt_spec *,
+                              const gchar *encoding, union value *);
 
 gchar * convert_glib_filename_to_system_filename (const gchar *fname,
 						  GError **err);