Actually implement the new procedure code and adapt all of its clients

[pspp-builds.git] / src / data / variable.c

diff --git a/src/data/variable.c b/src/data/variable.c
index 28065cafa111f6b6da32288e6e94f842d8c61a9d..768aa477835a4749f27ab816d8abec4ad4b6aa52 100644 (file)
--- a/src/data/variable.c
+++ b/src/data/variable.c
@@ -21,7 +21,8 @@
 
 #include <stdlib.h>
 
-#include "cat-routines.h"
+
+#include "category.h"
 #include "data-out.h"
 #include "format.h"
 #include "dictionary.h"
@@ -422,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. */