make depend

[darkstat] / hosts_sort.c

diff --git a/hosts_sort.c b/hosts_sort.c
index 15dd213..b6f32dd 100644 (file)
--- a/hosts_sort.c
+++ b/hosts_sort.c
@@ -1,5 +1,5 @@
 /* darkstat 3
- * copyright (c) 2001-2006 Emil Mikulic.
+ * copyright (c) 2001-2011 Emil Mikulic.
  *
  * hosts_sort.c: quicksort a table of buckets.
  *
@@ -7,9 +7,9 @@
  * GNU General Public License version 2. (see COPYING.GPL)
  */
 
-#include "darkstat.h"
-#include "hosts_db.h"
+#include "cdefs.h"
 #include "err.h"
+#include "hosts_db.h"
 
 /* ---------------------------------------------------------------------------
  * comparator for sorting (biggest first)
@@ -33,6 +33,10 @@ cmp(const struct bucket * const *x, const struct bucket * const *y,
       a = (*x)->total;
       b = (*y)->total;
       break;
+   case LASTSEEN:
+      a = (*x)->u.host.last_seen_mono;
+      b = (*y)->u.host.last_seen_mono;
+      break;
    default:
       errx(1, "cmp: unknown direction: %d", dir);
    }
@@ -179,9 +183,9 @@ loop:
        }
 
        pn = a + n;
-       r = min(pa - a, pb - pa);
+       r = MIN(pa - a, pb - pa);
        vecswap(a, pb - r, r);
-       r = min(pd - pc, pn - pd - 1);
+       r = MIN(pd - pc, pn - pd - 1);
        vecswap(pb, pn - r, r);
        if (((r = pb - pa) > 1) && ((unsigned)r >= left))
                qsort_buckets(a, r, left, right, dir);