[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 08/13] helper: New function value_to_text__().
From: |
Ben Pfaff |
Subject: |
[PATCH 08/13] helper: New function value_to_text__(). |
Date: |
Mon, 16 Apr 2012 20:52:14 -0700 |
One potential caller of value_to_text() doesn't have a "struct
variable" but does have the other needed information.
---
src/ui/gui/helper.c | 21 ++++++++++++++++++---
src/ui/gui/helper.h | 2 ++
2 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/src/ui/gui/helper.c b/src/ui/gui/helper.c
index 30f7da1..04c9bfe 100644
--- a/src/ui/gui/helper.c
+++ b/src/ui/gui/helper.c
@@ -58,10 +58,26 @@
gchar *
value_to_text (union value v, const struct variable *var)
{
+ return value_to_text__ (v, var_get_print_format (var),
+ var_get_encoding (var));
+}
+
+/* Formats a value with format FORMAT and strips white space appropriately for
+ FORMATs' type. That is, if FORMAT is numeric, strips leading white space
+ (because numbers are right-justified within their fields), and if FORMAT is
+ string, strips trailing white space (because spaces pad out string values on
+ the right).
+
+ Returns an allocated string. The returned string must be freed when no
+ longer required. */
+gchar *
+value_to_text__ (union value v,
+ const struct fmt_spec *format, const char *encoding)
+{
gchar *s;
- s = data_out (&v, var_get_encoding (var), var_get_print_format (var));
- if (var_is_numeric (var))
+ s = data_out (&v, encoding, format);
+ if (fmt_is_numeric (format->type))
g_strchug (s);
else
g_strchomp (s);
@@ -69,7 +85,6 @@ value_to_text (union value v, const struct variable *var)
return s;
}
-
/* Converts TEXT to a value.
VAL will be initialised and filled by this function.
diff --git a/src/ui/gui/helper.h b/src/ui/gui/helper.h
index 25b9d50..d9fb3d6 100644
--- a/src/ui/gui/helper.h
+++ b/src/ui/gui/helper.h
@@ -46,6 +46,8 @@ null_if_empty_param (const gchar *name, const gchar *nick,
gchar * value_to_text (union value v, const struct variable *);
+gchar * value_to_text__ (union value v, const struct fmt_spec *,
+ const char *encoding);
union value *
--
1.7.2.5
- Re: [PATCH 01/13] psppire-dict: g_return_if_fail for idx in psppire_dict_get_variable()., (continued)
[PATCH 02/13] gui: Use canonical names for signals., Ben Pfaff, 2012/04/16
[PATCH 03/13] gui: Add undocumented --measure-startup option., Ben Pfaff, 2012/04/16
[PATCH 04/13] gui: Call g_thread_init() earlier., Ben Pfaff, 2012/04/16
[PATCH 05/13] format: New functions fmt_change_width(), fmt_change_decimals()., Ben Pfaff, 2012/04/16
[PATCH 07/13] format: Fix typo in comment., Ben Pfaff, 2012/04/16
[PATCH 08/13] helper: New function value_to_text__().,
Ben Pfaff <=
[PATCH 09/13] value-labels: New function val_labs_find_value()., Ben Pfaff, 2012/04/16
[PATCH 06/13] format: Introduce a new type "enum fmt_use"., Ben Pfaff, 2012/04/16
[PATCH 10/13] abt: Drop child parameters from 'reaugment' function., Ben Pfaff, 2012/04/16
[PATCH 11/13] abt: New function abt_is_empty()., Ben Pfaff, 2012/04/16
[PATCH 12/13] range-set: Rename "insert" function "set1", "delete" to "set0"., Ben Pfaff, 2012/04/16
[PATCH 13/13] range-set: New macro RANGE_SET_FOR_EACH to make iteration easier., Ben Pfaff, 2012/04/16
Re: [PATCH 00/13] second batch of psppsheet changes, John Darrington, 2012/04/18