X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fhashtable%2Futils.cpp;h=516deeb64bbb6dcf8b3550abd0f236616bcec6c2;hb=52e345b9ac912d033c2a2c25a170a01cf209839d;hp=12aed19390bfd4d88e494a3d2fe3706f900bb6e7;hpb=c922647daed3dd022be11980063b5fb816d8c091;p=lttng-tools.git

diff --git a/src/common/hashtable/utils.cpp b/src/common/hashtable/utils.cpp
index 12aed1939..516deeb64 100644
--- a/src/common/hashtable/utils.cpp
+++ b/src/common/hashtable/utils.cpp
@@ -47,23 +47,23 @@
 #include <time.h>       /* defines time_t for timings in the test */
 #include <urcu/compiler.h>
 
-#include "utils.h"
-#include <common/compat/endian.h>    /* attempt to define endianness */
-#include <common/common.h>
-#include <common/hashtable/hashtable.h>
+#include "utils.hpp"
+#include <common/compat/endian.hpp>    /* attempt to define endianness */
+#include <common/common.hpp>
+#include <common/hashtable/hashtable.hpp>
 
 /*
  * My best guess at if you are big-endian or little-endian.  This may
  * need adjustment.
  */
-#if (defined(__BYTE_ORDER) && defined(__LITTLE_ENDIAN) && \
-     __BYTE_ORDER == __LITTLE_ENDIAN) || \
+#if (defined(BYTE_ORDER) && defined(LITTLE_ENDIAN) && \
+     BYTE_ORDER == LITTLE_ENDIAN) || \
     (defined(i386) || defined(__i386__) || defined(__i486__) || \
      defined(__i586__) || defined(__i686__) || defined(vax) || defined(MIPSEL))
 # define HASH_LITTLE_ENDIAN 1
 # define HASH_BIG_ENDIAN 0
-#elif (defined(__BYTE_ORDER) && defined(__BIG_ENDIAN) && \
-       __BYTE_ORDER == __BIG_ENDIAN) || \
+#elif (defined(BYTE_ORDER) && defined(BIG_ENDIAN) && \
+       BYTE_ORDER == BIG_ENDIAN) || \
       (defined(sparc) || defined(POWERPC) || defined(mc68000) || defined(sel))
 # define HASH_LITTLE_ENDIAN 0
 # define HASH_BIG_ENDIAN 1
@@ -187,8 +187,8 @@ static uint32_t __attribute__((unused)) hashword(const uint32_t *k,
 
 	/*----------------------------------- handle the last 3 uint32_t's */
 	switch (length) {	/* all the case statements fall through */
-	case 3: c += k[2];
-	case 2: b += k[1];
+	case 3: c += k[2]; /* fall through */
+	case 2: b += k[1]; /* fall through */
 	case 1: a += k[0];
 		final(a, b, c);
 	case 0:			/* case 0: nothing left to add */
@@ -226,11 +226,14 @@ static void __attribute__((unused)) hashword2(const uint32_t *k, size_t length,
 	switch (length) {
 	case 3 :
 		c += k[2];
+		/* fall through */
 	case 2 :
 		b += k[1];
+		/* fall through */
 	case 1 :
 		a += k[0];
 		final(a, b, c);
+		/* fall through */
 	case 0:     /* case 0: nothing left to add */
 		break;
 	}
@@ -416,17 +419,17 @@ static uint32_t hashlittle(const void *key,
 		}
 
 		switch(length) {                  /* all the case statements fall through */
-		case 12: c+=((uint32_t)k[11])<<24;
-		case 11: c+=((uint32_t)k[10])<<16;
-		case 10: c+=((uint32_t)k[9])<<8;
-		case 9: c+=k[8];
-		case 8: b+=((uint32_t)k[7])<<24;
-		case 7: b+=((uint32_t)k[6])<<16;
-		case 6: b+=((uint32_t)k[5])<<8;
-		case 5: b+=k[4];
-		case 4: a+=((uint32_t)k[3])<<24;
-		case 3: a+=((uint32_t)k[2])<<16;
-		case 2: a+=((uint32_t)k[1])<<8;
+		case 12: c+=((uint32_t)k[11])<<24; /* fall through */
+		case 11: c+=((uint32_t)k[10])<<16; /* fall through */
+		case 10: c+=((uint32_t)k[9])<<8; /* fall through */
+		case 9: c+=k[8]; /* fall through */
+		case 8: b+=((uint32_t)k[7])<<24; /* fall through */
+		case 7: b+=((uint32_t)k[6])<<16; /* fall through */
+		case 6: b+=((uint32_t)k[5])<<8; /* fall through */
+		case 5: b+=k[4]; /* fall through */
+		case 4: a+=((uint32_t)k[3])<<24; /* fall through */
+		case 3: a+=((uint32_t)k[2])<<16; /* fall through */
+		case 2: a+=((uint32_t)k[1])<<8; /* fall through */
 		case 1:
 			a+=k[0];
 			break;