Merge pull request #57 from fperrad/lint_20150420

Lint 20150420

src/uthash.h

@@ -536,10 +536,10 @@ do {
 #if (defined(__i386__) || defined(__x86_64__)  || defined(_M_IX86))
 #define MUR_GETBLOCK(p,i) p[i]
 #else /* non intel */
-#define MUR_PLUS0_ALIGNED(p) (((unsigned long)p & 0x3) == 0)
-#define MUR_PLUS1_ALIGNED(p) (((unsigned long)p & 0x3) == 1)
-#define MUR_PLUS2_ALIGNED(p) (((unsigned long)p & 0x3) == 2)
-#define MUR_PLUS3_ALIGNED(p) (((unsigned long)p & 0x3) == 3)
+#define MUR_PLUS0_ALIGNED(p) (((unsigned long)p & 3UL) == 0UL)
+#define MUR_PLUS1_ALIGNED(p) (((unsigned long)p & 3UL) == 1UL)
+#define MUR_PLUS2_ALIGNED(p) (((unsigned long)p & 3UL) == 2UL)
+#define MUR_PLUS3_ALIGNED(p) (((unsigned long)p & 3UL) == 3UL)
 #define WP(p) ((uint32_t*)((unsigned long)(p) & ~3UL))
 #if (defined(__BIG_ENDIAN__) || defined(SPARC) || defined(__ppc__) || defined(__ppc64__))
 #define MUR_THREE_ONE(p) ((((*WP(p))&0x00ffffff) << 8) | (((*(WP(p)+1))&0xff000000) >> 24))

tests/test39.c

@@ -13,7 +13,7 @@ int main() {
   ns_t *nsp;
   ns_t *head = NULL;
 
-  for(i=0; i < sizeof(keys)/sizeof(keys[0]); i++) {
+  for(i=0; i < (sizeof(keys)/sizeof(keys[0])); i++) {
     printf("adding key %s\n", keys[i]);
     nsp = (ns_t*)malloc(sizeof(ns_t));
     if (nsp == NULL) exit(-1);
@@ -22,7 +22,7 @@ int main() {
   }
   printf("hash count is %u\n", HASH_COUNT(head));
 
-  for(i=0; i < sizeof(keys)/sizeof(keys[0]); i++) {
+  for(i=0; i < (sizeof(keys)/sizeof(keys[0])); i++) {
     printf("looking for key %s... ", keys[i]);
     HASH_FIND(hh,head,keys[i],strlen(keys[i]),nsp);
     printf("%s.\n", (nsp!=NULL)?"found":"not found");

tests/test62.c

@@ -3,10 +3,10 @@
 #include <inttypes.h>
 #include "uthash.h"
 
-#define MUR_PLUS0_ALIGNED(p) (((unsigned long)p & 0x3) == 0)
-#define MUR_PLUS1_ALIGNED(p) (((unsigned long)p & 0x3) == 1)
-#define MUR_PLUS2_ALIGNED(p) (((unsigned long)p & 0x3) == 2)
-#define MUR_PLUS3_ALIGNED(p) (((unsigned long)p & 0x3) == 3)
+#define MUR_PLUS0_ALIGNED(p) (((unsigned long)p & 3UL) == 0UL)
+#define MUR_PLUS1_ALIGNED(p) (((unsigned long)p & 3UL) == 1UL)
+#define MUR_PLUS2_ALIGNED(p) (((unsigned long)p & 3UL) == 2UL)
+#define MUR_PLUS3_ALIGNED(p) (((unsigned long)p & 3UL) == 3UL)
 
 #define yn(rc) ((rc!=0U)?"y":"n")
 int main(int argc,char*argv[]) {