* value.h (value_cnt_from_width): New function.

* variable.c (var_get_value_cnt): Use new function.

diff --git a/src/data/ChangeLog b/src/data/ChangeLog
index a74549fbcdc51bb877c7f55653298972d85e8250..56976e375c6e92a916773fc02be92c1722d29886 100644 (file)
--- a/src/data/ChangeLog
+++ b/src/data/ChangeLog
@@ -1,3 +1,9 @@
+2007-06-06  Ben Pfaff  <blp@gnu.org>
+
+       * value.h (value_cnt_from_width): New function.
+
+       * variable.c (var_get_value_cnt): Use new function.
+
 2007-06-06  Ben Pfaff  <blp@gnu.org>
 
        Add casegrouper, to allow cases read from a given casereader to be

diff --git a/src/data/value.h b/src/data/value.h
index e3e3f0de4ce9fab2267f535cd919bfdbdc73ba1f..9e771b733fc43b9a59efb07f3ac0b28acac1b230 100644 (file)
--- a/src/data/value.h
+++ b/src/data/value.h
@@ -38,6 +38,14 @@
 #define LOWEST second_lowest_value
 #define HIGHEST DBL_MAX
 
+/* Number of "union value"s required for a variable of the given
+   WIDTH. */
+static inline size_t
+value_cnt_from_width (int width)
+{
+  return width == 0 ? 1 : DIV_RND_UP (width, MAX_SHORT_STRING);
+}
+
 /* A numeric or short string value.
    Multiple consecutive values represent a long string. */
 union value

diff --git a/src/data/variable.c b/src/data/variable.c
index f890746ac051c12adf355b9824c53939a0c5e1e1..768aa477835a4749f27ab816d8abec4ad4b6aa52 100644 (file)
--- a/src/data/variable.c
+++ b/src/data/variable.c
@@ -423,7 +423,7 @@ var_is_long_string (const struct variable *v)
 size_t
 var_get_value_cnt (const struct variable *v) 
 {
-  return v->width == 0 ? 1 : DIV_RND_UP (v->width, MAX_SHORT_STRING);
+  return value_cnt_from_width (v->width);
 }
 \f
 /* Returns variable V's missing values. */