X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fhashtable%2Futils.cpp;fp=src%2Fcommon%2Fhashtable%2Futils.cpp;h=5b9344b15ba36cf430b55c69214328f58ff4293f;hp=305660c804ff6319f3d7aea7c36055590858e261;hb=5c7248cd5bce45bf64d563fb4e130a63bf345f11;hpb=cd9adb8b829564212158943a0d279bb35322ab30

diff --git a/src/common/hashtable/utils.cpp b/src/common/hashtable/utils.cpp
index 305660c80..5b9344b15 100644
--- a/src/common/hashtable/utils.cpp
+++ b/src/common/hashtable/utils.cpp
@@ -117,26 +117,26 @@
  * on, and rotates are much kinder to the top and bottom bits, so I used
  * rotates.
  */
-#define mix(a, b, c)             \
-	{                        \
-		a -= c;          \
-		a ^= rot(c, 4);  \
-		c += b;          \
-		b -= a;          \
-		b ^= rot(a, 6);  \
-		a += c;          \
-		c -= b;          \
-		c ^= rot(b, 8);  \
-		b += a;          \
-		a -= c;          \
-		a ^= rot(c, 16); \
-		c += b;          \
-		b -= a;          \
-		b ^= rot(a, 19); \
-		a += c;          \
-		c -= b;          \
-		c ^= rot(b, 4);  \
-		b += a;          \
+#define mix(a, b, c)               \
+	{                          \
+		(a) -= (c);        \
+		(a) ^= rot(c, 4);  \
+		(c) += (b);        \
+		(b) -= (a);        \
+		(b) ^= rot(a, 6);  \
+		(a) += (c);        \
+		(c) -= (b);        \
+		(c) ^= rot(b, 8);  \
+		(b) += (a);        \
+		(a) -= (c);        \
+		(a) ^= rot(c, 16); \
+		(c) += (b);        \
+		(b) -= (a);        \
+		(b) ^= rot(a, 19); \
+		(a) += (c);        \
+		(c) -= (b);        \
+		(c) ^= rot(b, 4);  \
+		(b) += (a);        \
 	}
 
 /*
@@ -162,22 +162,22 @@
  *  10  8 15 26 3 22 24
  *  11  8 15 26 3 22 24
  */
-#define final(a, b, c)           \
-	{                        \
-		c ^= b;          \
-		c -= rot(b, 14); \
-		a ^= c;          \
-		a -= rot(c, 11); \
-		b ^= a;          \
-		b -= rot(a, 25); \
-		c ^= b;          \
-		c -= rot(b, 16); \
-		a ^= c;          \
-		a -= rot(c, 4);  \
-		b ^= a;          \
-		b -= rot(a, 14); \
-		c ^= b;          \
-		c -= rot(b, 24); \
+#define final(a, b, c)             \
+	{                          \
+		(c) ^= (b);        \
+		(c) -= rot(b, 14); \
+		(a) ^= (c);        \
+		(a) -= rot(c, 11); \
+		(b) ^= (a);        \
+		(b) -= rot(a, 25); \
+		(c) ^= (b);        \
+		(c) -= rot(b, 16); \
+		(a) ^= (c);        \
+		(a) -= rot(c, 4);  \
+		(b) ^= (a);        \
+		(b) -= rot(a, 14); \
+		(c) ^= (b);        \
+		(c) -= rot(b, 24); \
 	}
 
 /*