From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Fri, 8 Apr 2016 13:32:07 +0000 (+0100)
Subject: [Minor] Use more simple swap algorithm
X-Git-Tag: 1.2.3~32
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=190613b7dabb97ffcaea79884a622cca09c4037e;p=thirdparty%2Frspamd.git

[Minor] Use more simple swap algorithm
---

diff --git a/src/libutil/heap.c b/src/libutil/heap.c
index 354dfedc5a..fe88cca88b 100644
--- a/src/libutil/heap.c
+++ b/src/libutil/heap.c
@@ -21,14 +21,13 @@ struct rspamd_min_heap {
 	GPtrArray *ar;
 };
 
-#define XORSWAP_DISTINCT(a, b)	((a)^=(b),(b)^=(a),(a)^=(b))
 #define heap_swap(h,e1,e2) do { \
-	guintptr a1 = (guintptr)(h)->ar->pdata[(e2)->idx]; \
-	guintptr a2 = (guintptr)(h)->ar->pdata[(e1)->idx]; \
-	XORSWAP_DISTINCT((e1)->idx, (e2)->idx); \
-	XORSWAP_DISTINCT (a1, a2); \
-	(h)->ar->pdata[(e2)->idx] = (gpointer)a1; \
-	(h)->ar->pdata[(e1)->idx] = (gpointer)a2; \
+	gpointer telt = (h)->ar->pdata[(e1)->idx]; \
+	(h)->ar->pdata[(e1)->idx] = (h)->ar->pdata[(e2)->idx]; \
+	(h)->ar->pdata[(e2)->idx] = telt; \
+	guint tidx = (e1)->idx; \
+	(e1)->idx = (e2)->idx; \
+	(e2)->idx = tidx; \
 } while (0)
 
 #define min_elt(e1, e2) ((e1)->pri <= (e2)->pri ? (e1) : (e2))