[Minor] Define simple ftok hash and equal functions

diff --git a/src/libutil/str_util.c b/src/libutil/str_util.c
index 86369909ad3ef8091b7c563b9f98f2d7286c0160..dc45cba45e3d1b7ae68f467bd28d4bb7e04b07da 100644 (file)
--- a/src/libutil/str_util.c
+++ b/src/libutil/str_util.c
@@ -332,27 +332,6 @@ rspamd_ftok_icase_hash (gconstpointer key)
        return (guint)rspamd_icase_hash (f->begin, f->len, rspamd_hash_seed ());
 }
 
-gboolean
-rspamd_ftok_equal (gconstpointer v, gconstpointer v2)
-{
-       const rspamd_ftok_t *f1 = v, *f2 = v2;
-
-       if (f1->len == f2->len &&
-               memcmp (f1->begin, f2->begin, f1->len) == 0) {
-               return TRUE;
-       }
-
-       return FALSE;
-}
-
-guint
-rspamd_ftok_hash (gconstpointer key)
-{
-       const rspamd_ftok_t *f = key;
-
-       return (guint)rspamd_cryptobox_fast_hash (f->begin, f->len, rspamd_hash_seed ());
-}
-
 gboolean
 rspamd_gstring_icase_equal (gconstpointer v, gconstpointer v2)
 {

diff --git a/src/libutil/str_util.h b/src/libutil/str_util.h
index 199a384cacbe9250c10d86484c890a496ac00b6d..c0b9c1323db8a5e3631dd72d8978a8e305093fa8 100644 (file)
--- a/src/libutil/str_util.h
+++ b/src/libutil/str_util.h
@@ -80,9 +80,9 @@ guint rspamd_ftok_icase_hash (gconstpointer key);
 
 gboolean rspamd_ftok_icase_equal (gconstpointer v, gconstpointer v2);
 
-guint rspamd_ftok_hash (gconstpointer key);
-
-gboolean rspamd_ftok_equal (gconstpointer v, gconstpointer v2);
+/* Use in khash for speed */
+#define rspamd_ftok_hash(key) _wyhash32((key)->begin, (key)->len, 0)
+#define rspamd_ftok_equal(v1, v2) ((v1)->len == (v2)->len && memcmp((v1)->begin, (v2)->begin, (v1)->len) == 0)
 
 guint rspamd_gstring_icase_hash (gconstpointer key);