Fri Dec 19 23:35:04 2003 Ben Pfaff <blp@gnu.org>

[pspp] / src / sort.c

diff --git a/src/sort.c b/src/sort.c
index e5feef94c208d545a1679d664a63c372353a42f3..c77d84626887ab735c4c39c6183ccaaef7c7c8c1 100644 (file)
--- a/src/sort.c
+++ b/src/sort.c
@@ -48,8 +48,6 @@
 #include <sys/stat.h>
 #endif
 
-#undef DEBUGGING
-/*#define DEBUGGING 1*/
 #include "debug-print.h"
 
 /* Variables to sort. */
@@ -59,11 +57,6 @@ int nv_sort;
 /* Used when internal-sorting to a separate file. */
 static struct case_list **separate_case_tab;
 
-/* Exported by qsort.c. */
-void blp_quicksort (void *pbase, size_t total_elems, size_t size,
-                   int (*cmp) (const void *, const void *),
-                   void *temp_buf);
-
 /* Other prototypes. */
 static int compare_case_lists (const void *, const void *);
 static int do_internal_sort (int separate);
@@ -222,13 +215,16 @@ do_internal_sort (int separate)
   return 0;
 }
 
-/* Compares the NV_SORT variables in V_SORT[] between the `case_list's
-   at _A and _B, and returns a strcmp()-type result. */
+/* Compares the NV_SORT variables in V_SORT[] between the
+   `case_list's at A and B, and returns a strcmp()-type
+   result. */
 static int
-compare_case_lists (const void *pa, const void *pb)
+compare_case_lists (const void *a_, const void *b_)
 {
-  struct case_list *a = *(struct case_list **) pa;
-  struct case_list *b = *(struct case_list **) pb;
+  struct case_list *const *pa = a_;
+  struct case_list *const *pb = b_;
+  struct case_list *a = *pa;
+  struct case_list *b = *pb;
   struct variable *v;
   int result = 0;
   int i;
@@ -239,27 +235,21 @@ compare_case_lists (const void *pa, const void *pb)
       
       if (v->type == NUMERIC)
        {
-         if (approx_ne (a->c.data[v->fv].f, b->c.data[v->fv].f))
-           {
-             result = (a->c.data[v->fv].f > b->c.data[v->fv].f) ? 1 : -1;
-             break;
-           }
+          double af = a->c.data[v->fv].f;
+          double bf = b->c.data[v->fv].f;
+
+          result = af < bf ? -1 : af > bf;
        }
       else
-       {
-         result = memcmp (a->c.data[v->fv].s, b->c.data[v->fv].s, v->width);
-         if (result != 0)
-           break;
-       }
-    }
+        result = memcmp (a->c.data[v->fv].s, b->c.data[v->fv].s, v->width);
 
-  if (v->p.srt.order == SRT_ASCEND)
-    return result;
-  else
-    {
-      assert (v->p.srt.order == SRT_DESCEND);
-      return -result;
+      if (result != 0)
+        break;
     }
+
+  if (v->p.srt.order == SRT_DESCEND)
+    result = -result;
+  return result;
 }
 \f
 /* External sort. */