Fixed a bug causing pspp to crash when computed variables had no format

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

diff --git a/src/count.c b/src/count.c
index 02cb7838891fe415541e5d01f0d00c0683199f50..3b9a0ac098c752593f7b68f99ff9bf5955627e61 100644 (file)
--- a/src/count.c
+++ b/src/count.c
@@ -21,7 +21,6 @@
 #include <assert.h>
 #include <stdlib.h>
 #include "alloc.h"
-#include "approx.h"
 #include "command.h"
 #include "error.h"
 #include "lexer.h"
@@ -220,11 +219,8 @@ cmd_count (void)
           the same dest var more than once. */
        cnt->d = dict_lookup_var (default_dict, cnt->n);
 
-       if (!cnt->d) 
-          {
-            cnt->d = dict_create_var (default_dict, cnt->n, 0);
-            assert (cnt->d != NULL); 
-          }
+       if (cnt->d == NULL) 
+          cnt->d = dict_create_var_assert (default_dict, cnt->n, 0);
       }
 
 #if DEBUGGING
@@ -421,22 +417,22 @@ count_numeric (struct counting * cnt, struct ccase * c)
            assert (0);
            break;
          case CNT_SINGLE:
-           if (approx_ne (cmp, num->a))
+           if (cmp != num->a)
              break;
            counter++;
            goto done;
          case CNT_HIGH:
-           if (approx_lt (cmp, num->a))
+           if (cmp < num->a)
              break;
            counter++;
            goto done;
          case CNT_LOW:
-           if (approx_gt (cmp, num->a))
+           if (cmp > num->a)
              break;
            counter++;
            goto done;
          case CNT_RANGE:
-           if (approx_lt (cmp, num->a) || approx_gt (cmp, num->b))
+           if (cmp < num->a || cmp > num->b)
              break;
            counter++;
            goto done;