X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fsn_comparator.c;h=1c9a3e657245d46a7c256f6bafc1d8aa7f42ebcb;hb=7f5611eaa2e099c4422c49a8c47fd437b291dfb4;hp=583e15774d9ad93783272f2e555b3b3b1c72bbcc;hpb=f35c47cabbc75b05286e335dc92206b3afb08825;p=sort-networks.git

diff --git a/src/sn_comparator.c b/src/sn_comparator.c
index 583e157..1c9a3e6 100644
--- a/src/sn_comparator.c
+++ b/src/sn_comparator.c
@@ -1,19 +1,20 @@
 /**
- * collectd - src/sn_comparator.c
+ * libsortnetwork - src/sn_comparator.c
  * Copyright (C) 2008-2010  Florian octo Forster
  *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; only version 2 of the License is applicable.
+ * This library is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or (at
+ * your option) any later version.
  *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
  *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  *
  * Authors:
  *   Florian octo Forster <ff at octo.it>
@@ -42,12 +43,17 @@ sn_comparator_t *sn_comparator_create (int min, int max)
 
   c->min = min;
   c->max = max;
+  c->user_data = NULL;
+  c->free_func = NULL;
 
   return (c);
 } /* sn_comparator_t *sn_comparator_create */
 
 void sn_comparator_destroy (sn_comparator_t *c)
 {
+  if (c->free_func != NULL)
+    c->free_func (c->user_data);
+
   if (c != NULL)
     free (c);
 } /* void sn_comparator_destroy */
@@ -88,11 +94,9 @@ void sn_comparator_swap (sn_comparator_t *c, int con0, int con1)
   }
 } /* void sn_comparator_swap */
 
-int sn_comparator_compare (const void *v0, const void *v1)
+int sn_comparator_compare (const sn_comparator_t *c0,
+    const sn_comparator_t *c1)
 {
-  sn_comparator_t *c0 = (sn_comparator_t *) v0;
-  sn_comparator_t *c1 = (sn_comparator_t *) v1;
-
   if (SN_COMP_LEFT (c0) < SN_COMP_LEFT (c1))
     return (-1);
   else if (SN_COMP_LEFT (c0) > SN_COMP_LEFT (c1))
@@ -105,4 +109,14 @@ int sn_comparator_compare (const void *v0, const void *v1)
     return (0);
 } /* int sn_comparator_compare */
 
+uint64_t sn_comparator_get_hashval (const sn_comparator_t *c) /* {{{ */
+{
+  if (c == NULL)
+    return (0);
+
+  /* 100937 and 103319 are some random prime numbers */
+  return ((((uint64_t) c->min) * 100937)
+      + (((uint64_t) c->max) * 103319));
+} /* }}} uint32_t sn_comparator_get_hashval */
+
 /* vim: set shiftwidth=2 softtabstop=2 : */