fix compilation warnings with recent compiler

diff --git a/src/ecoli_malloc.c b/src/ecoli_malloc.c
index 5a022ae9c1a75c2ed28f77f1c459b489342ff3cc..e7f02dfc5afe24704dbe9c4c9afc3950a866d431 100644 (file)
--- a/src/ecoli_malloc.c
+++ b/src/ecoli_malloc.c
@@ -7,6 +7,7 @@
 #include <ecoli_malloc.h>
 
 #include <stdlib.h>
 #include <ecoli_malloc.h>
 
 #include <stdlib.h>

+#include <stdint.h>

 #include <string.h>
 #include <errno.h>
 
 #include <string.h>
 #include <errno.h>
 


@@ -164,7 +165,10 @@ static int ec_malloc_testcase(void)
        ec_free_func(ptr);
        ptr = NULL;
 
        ec_free_func(ptr);
        ptr = NULL;
 

-       ptr = ec_calloc(2, (size_t)-1);
+       /* here we use atoll() instead of a constant because we want to
+        * prevent the compiler to check the overflow at compilation
+        * time */
+       ptr = ec_calloc(2, atoll("0xffffffffffffffff"));

        EC_TEST_CHECK(ptr == NULL, "bad overflow check in ec_calloc\n");
 
        return testres;
        EC_TEST_CHECK(ptr == NULL, "bad overflow check in ec_calloc\n");
 
        return testres;

diff --git a/src/ecoli_murmurhash.c b/src/ecoli_murmurhash.c
index 7aafece1d205f05300e2223281392e927510d230..8b45f6ebb5c58d3f727f5bc407686a1cf1c099d1 100644 (file)
--- a/src/ecoli_murmurhash.c
+++ b/src/ecoli_murmurhash.c
@@ -27,8 +27,8 @@ uint32_t ec_murmurhash3(const void *key, int len, uint32_t seed)
        k1 = 0;
 
        switch(len & 3) {
        k1 = 0;
 
        switch(len & 3) {

-       case 3: k1 ^= tail[2] << 16;
-       case 2: k1 ^= tail[1] << 8;
+       case 3: k1 ^= tail[2] << 16; /* fallthrough */
+       case 2: k1 ^= tail[1] << 8; /* fallthrough */

        case 1: k1 ^= tail[0];
                h1 = ec_murmurhash3_add32(h1, k1);
        };
        case 1: k1 ^= tail[0];
                h1 = ec_murmurhash3_add32(h1, k1);
        };