treewide: Replace <name>_cnt by n_<name>s and <name>_cap by allocated_<name>.

[pspp] / src / language / xforms / compute.c

diff --git a/src/language/xforms/compute.c b/src/language/xforms/compute.c
index aa81729827bc35046bc5a129560a541efa125c83..9193dbc71e9c0f057efc911c12dfbb2c3462eb38 100644 (file)
--- a/src/language/xforms/compute.c
+++ b/src/language/xforms/compute.c
@@ -133,7 +133,7 @@ compute_num (void *compute_, struct ccase **c, casenumber case_num)
       || expr_evaluate_num (compute->test, *c, case_num) == 1.0)
     {
       *c = case_unshare (*c);
-      case_data_rw (*c, compute->variable)->f
+      *case_num_rw (*c, compute->variable)
         = expr_evaluate_num (compute->rvalue, *c, case_num);
     }
 
@@ -156,7 +156,7 @@ compute_num_vec (void *compute_, struct ccase **c, casenumber case_num)
       index = expr_evaluate_num (compute->element, *c, case_num);
       rindx = floor (index + EPSILON);
       if (index == SYSMIS
-          || rindx < 1 || rindx > vector_get_var_cnt (compute->vector))
+          || rindx < 1 || rindx > vector_get_n_vars (compute->vector))
         {
           if (index == SYSMIS)
             msg (SW, _("When executing COMPUTE: SYSMIS is not a valid value "
@@ -170,7 +170,7 @@ compute_num_vec (void *compute_, struct ccase **c, casenumber case_num)
         }
 
       *c = case_unshare (*c);
-      case_data_rw (*c, vector_get_var (compute->vector, rindx - 1))->f
+      *case_num_rw (*c, vector_get_var (compute->vector, rindx - 1))
         = expr_evaluate_num (compute->rvalue, *c, case_num);
     }
 
@@ -219,7 +219,7 @@ compute_str_vec (void *compute_, struct ccase **c, casenumber case_num)
                vector_get_name (compute->vector));
           return TRNS_CONTINUE;
         }
-      else if (rindx < 1 || rindx > vector_get_var_cnt (compute->vector))
+      else if (rindx < 1 || rindx > vector_get_n_vars (compute->vector))
         {
           msg (SW, _("When executing COMPUTE: %.*g is not a valid value as "
                      "an index into vector %s."),