Index: merge/src/data/value.h
===================================================================
--- merge.orig/src/data/value.h 2007-06-03 18:44:51.000000000 -0700
+++ merge/src/data/value.h 2007-06-04 21:31:31.000000000 -0700
@@ -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
Index: merge/src/data/variable.c
===================================================================
--- merge.orig/src/data/variable.c 2007-06-03 18:44:51.000000000 -0700
+++ merge/src/data/variable.c 2007-06-04 21:31:31.000000000 -0700
@@ -423,7 +423,7 @@
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);
}
/* Returns variable V's missing values. */
--
_______________________________________________
pspp-dev mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/pspp-dev
