Removed some unnecessary #include directives

[pspp-builds.git] / src / count.c

diff --git a/src/count.c b/src/count.c
index bab59f90c7c7db3d0f432bcf61948ad860368a43..8988f3cb6e73e36f4e12fecaa9411fd41e310c6d 100644 (file)
--- a/src/count.c
+++ b/src/count.c
@@ -91,7 +91,7 @@ struct counting
 
     /* variables to count */
     struct variable **v;
-    int n;
+    size_t n;
 
     /* values to count */
     int missing;               /* (numeric only)
@@ -232,15 +232,15 @@ fail:
 static int
 parse_numeric_criteria (struct counting * c)
 {
-  int n = 0;
-  int m = 0;
+  size_t n = 0;
+  size_t m = 0;
 
   c->crit.n = 0;
   c->missing = 0;
   for (;;)
     {
       struct cnt_num *cur;
-      if (n >= m - 1)
+      if (n + 1 >= m)
        {
          m += 16;
          c->crit.n = xrealloc (c->crit.n, m * sizeof (struct cnt_num));
@@ -328,10 +328,10 @@ parse_string_criteria (struct counting * c)
 {
   int len = 0;
 
-  int n = 0;
-  int m = 0;
+  size_t n = 0;
+  size_t m = 0;
 
-  int i;
+  size_t i;
 
   for (i = 0; i < c->n; i++)
     if (c->v[i]->width > len)
@@ -341,7 +341,7 @@ parse_string_criteria (struct counting * c)
   for (;;)
     {
       struct cnt_str *cur;
-      if (n >= m - 1)
+      if (n + 1 >= m)
        {
          m += 16;
          c->crit.n = xrealloc (c->crit.n, m * sizeof (struct cnt_str));
@@ -371,7 +371,7 @@ static inline int
 count_numeric (struct counting * cnt, struct ccase * c)
 {
   int counter = 0;
-  int i;
+  size_t i;
 
   for (i = 0; i < cnt->n; i++)
     {
@@ -385,7 +385,7 @@ count_numeric (struct counting * cnt, struct ccase * c)
            counter++;
          continue;
        }
-      if (cnt->missing >= 2 && is_num_user_missing (cmp, cnt->v[i]))
+      if (cnt->missing >= 2 && mv_is_num_user_missing (&cnt->v[i]->miss, cmp))
        {
          counter++;
          continue;
@@ -436,7 +436,7 @@ static inline int
 count_string (struct counting * cnt, struct ccase * c)
 {
   int counter = 0;
-  int i;
+  size_t i;
 
   for (i = 0; i < cnt->n; i++)
     {