X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fcount.c;h=a6e70616460cf7ce40583c0f858e5801095d75a7;hb=06f9ee45954e5e71fa7f6262dbf37defa1dbf996;hp=dd88e01a62aeac8d4bf845af1ae0f9c06584c524;hpb=92bfefccd465052e492f669ce561aa25b0110283;p=pspp-builds.git

diff --git a/src/count.c b/src/count.c
index dd88e01a..a6e70616 100644
--- a/src/count.c
+++ b/src/count.c
@@ -21,6 +21,7 @@
 #include "error.h"
 #include <stdlib.h>
 #include "alloc.h"
+#include "case.h"
 #include "command.h"
 #include "error.h"
 #include "lexer.h"
@@ -366,16 +367,14 @@ static inline int
 count_numeric (struct counting * cnt, struct ccase * c)
 {
   int counter = 0;
-
-  struct cnt_num *num;
-
-  double cmp;
   int i;
 
   for (i = 0; i < cnt->n; i++)
     {
+      struct cnt_num *num;
+
       /* Extract the variable value and eliminate missing values. */
-      cmp = c->data[cnt->v[i]->fv].f;
+      double cmp = case_num (c, cnt->v[i]->fv);
       if (cmp == SYSMIS)
 	{
 	  if (cnt->missing >= 1)
@@ -433,27 +432,21 @@ static inline int
 count_string (struct counting * cnt, struct ccase * c)
 {
   int counter = 0;
-
-  struct cnt_str *str;
-
-  char *cmp;
-  int len;
-
   int i;
 
   for (i = 0; i < cnt->n; i++)
     {
-      /* Extract the variable value, variable width. */
-      cmp = c->data[cnt->v[i]->fv].s;
-      len = cnt->v[i]->width;
+      struct cnt_str *str;
 
+      /* Extract the variable value, variable width. */
       for (str = cnt->crit.s;; str++)
 	switch (str->type)
 	  {
 	  case CNT_ERROR:
 	    assert (0);
 	  case CNT_SINGLE:
-	    if (memcmp (cmp, str->s, len))
+	    if (memcmp (case_str (c, cnt->v[i]->fv), str->s,
+                        cnt->v[i]->width))
 	      break;
 	    counter++;
 	    goto done;
@@ -484,7 +477,7 @@ count_trns_proc (struct trns_header * trns, struct ccase * c,
 	  counter += count_numeric (cnt, c);
 	else
 	  counter += count_string (cnt, c);
-      c->data[info->d->fv].f = counter;
+      case_data_rw (c, info->d->fv)->f = counter;
     }
   return -1;
 }