diff --git a/lib/dialects/linux/dfile.c b/lib/dialects/linux/dfile.c index 74512667..68eff626 100644 --- a/lib/dialects/linux/dfile.c +++ b/lib/dialects/linux/dfile.c @@ -52,8 +52,10 @@ * minor device, and inode, modulo mod * (mod must be a power of 2) */ #define SFHASHDEVINO(maj, min, ino, mod) \ - ((int)(((int)((((int)(maj + 1)) * ((int)((min + 1)))) + ino) * 31415) & \ - (mod - 1))) + ((int)(((((unsigned int)(maj) + 1u) * ((unsigned int)(min) + 1u) + \ + (unsigned int)(ino)) * \ + 31415u) & \ + ((mod) - 1))) #define SFRDHASH \ 1024 /* Sfile hash by raw device number \ * bucket count (power of 2!) */ @@ -62,10 +64,11 @@ * minor raw device, and inode, modulo * mod (mod must be a power of 2) */ #define SFHASHRDEVI(maj, min, rmaj, rmin, ino, mod) \ - ((int)(((int)((((int)(maj + 1)) * ((int)((min + 1)))) + \ - ((int)(rmaj + 1) * (int)(rmin + 1)) + ino) * \ - 31415) & \ - (mod - 1))) + ((int)(((((unsigned int)(maj) + 1u) * ((unsigned int)(min) + 1u) + \ + ((unsigned int)(rmaj) + 1u) * ((unsigned int)(rmin) + 1u) + \ + (unsigned int)(ino)) * \ + 31415u) & \ + ((mod) - 1))) #define SFNMHASH \ 4096 /* Sfile hash by name bucket count \ * (must be a power of 2!) */ diff --git a/lib/dialects/linux/dnode.c b/lib/dialects/linux/dnode.c index 9b66def9..f4a35868 100644 --- a/lib/dialects/linux/dnode.c +++ b/lib/dialects/linux/dnode.c @@ -44,8 +44,10 @@ ((off_t)0x7fffffff) /* this is defined in \ * .../src/fs/locks.c and not \ * in a header file */ -#define HASHPID(pid) (((int)((pid * 31415) >> 3)) & (PIDBUCKS - 1)) -#define HASHPINFO(ino) (((int)((ino * 31415) >> 3)) & (PINFOBUCKS - 1)) +#define HASHPID(pid) \ + (((int)(((unsigned int)(pid) * 31415u) >> 3)) & (PIDBUCKS - 1)) +#define HASHPINFO(ino) \ + (((int)(((unsigned int)(ino) * 31415u) >> 3)) & (PINFOBUCKS - 1)) /* * Local structure definitions diff --git a/lib/dialects/linux/dsock.c b/lib/dialects/linux/dsock.c index 7811125b..ea1a9fe7 100644 --- a/lib/dialects/linux/dsock.c +++ b/lib/dialects/linux/dsock.c @@ -79,10 +79,10 @@ #define TCPUDP6_IPC_ADDR_INT32(a, n) (((a)->s6_addr32[n])) #define TCPUDP6_IPC_ADDR_MK_INT(a) \ - ((int)TCPUDP6_IPC_ADDR_INT32(a, 0x0) * 0x123 + \ - (int)TCPUDP6_IPC_ADDR_INT32(a, 0x1) * 0x111 + \ - (int)TCPUDP6_IPC_ADDR_INT32(a, 0x2) * 0x149 + \ - (int)TCPUDP6_IPC_ADDR_INT32(a, 0x3) * 0x185) + ((unsigned int)TCPUDP6_IPC_ADDR_INT32(a, 0x0) * 0x123 + \ + (unsigned int)TCPUDP6_IPC_ADDR_INT32(a, 0x1) * 0x111 + \ + (unsigned int)TCPUDP6_IPC_ADDR_INT32(a, 0x2) * 0x149 + \ + (unsigned int)TCPUDP6_IPC_ADDR_INT32(a, 0x3) * 0x185) #define TCPUDP6_IPC_HASH(tp) \ ((int)((((TCPUDP6_IPC_ADDR_MK_INT(&(tp)->faddr) + \