From a2ec05f1a02f9ca5fb7c702066b720f0c2542d45 Mon Sep 17 00:00:00 2001
From: Stathis Kamperis <ekamperi@auth.gr>
Date: Sun, 21 Oct 2007 23:06:25 +0300
Subject: [PATCH] Fix some splint warnings

---
 malloc/mpool.c | 12 ++++++------
 malloc/mpool.h |  8 ++++----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/malloc/mpool.c b/malloc/mpool.c
index c0d18ca..f258f53 100644
--- a/malloc/mpool.c
+++ b/malloc/mpool.c
@@ -12,7 +12,7 @@ mpret_t mpool_init(mpool_t **mpool, size_t maxlogsize, size_t minlogsize)
     size_t i;
 
     /* Validate input */
-    if (maxlogsize < minlogsize || (unsigned)(1  << minlogsize) <= sizeof *pblknode)
+    if (maxlogsize < minlogsize || (size_t)(1 << minlogsize) <= sizeof *pblknode)
         return MPOOL_EBADVAL;
 
     /* Allocate memory for memory pool data structure */
@@ -28,7 +28,7 @@ mpret_t mpool_init(mpool_t **mpool, size_t maxlogsize, size_t minlogsize)
 #endif
 
     /* Allocate the actual memory of the pool */
-    if (((*mpool)->mem = malloc(1 << maxlogsize)) == NULL) {
+    if (((*mpool)->mem = malloc((size_t)(1 << maxlogsize))) == NULL) {
         free(*mpool);
         return MPOOL_ENOMEM;
     }
@@ -105,7 +105,7 @@ void *mpool_alloc(mpool_t *mpool, size_t blksize)
         DPRINTF(("Searching block: %u\n", i));
         phead = &mpool->blktable[i];
         if ((pnode = LIST_FIRST(phead)) != NULL) {
-            if ((unsigned)(1 << pnode->logsize) >= size) {
+            if ((size_t)(1 << pnode->logsize) >= size) {
                 LIST_FOREACH(pnode, phead, next_chunk) {
                     /*if (pnode->flags & MP_NODE_AVAIL) {*/
                     if (MPOOL_IS_AVAIL(pnode)) {
@@ -142,8 +142,8 @@ AGAIN:;
      *
      * NOTE: log2(size/2) = log2(size) - log2(2) = log2(size) - 1
      */
-    if ((size == (unsigned)(1 << pavailnode->logsize))
-        || (size > (unsigned)(1 << (pavailnode->logsize - 1)))
+    if ((size == (size_t)(1 << pavailnode->logsize))
+        || (size > (size_t)(1 << (pavailnode->logsize - 1)))
         || (mpool->minlogsize > (pavailnode->logsize - 1))) {
         DPRINTF(("No split required\n"));
         /*pavailnode->flags &= ~MP_NODE_AVAIL;     Mark as no longer available */
@@ -184,7 +184,7 @@ AGAIN:;
     DPRINTF(("Will add new item with bytes: %u (0x%x)\n",
              1 << pavailnode->logsize,
              1 << pavailnode->logsize));
-    if ((unsigned) (1 << pavailnode->logsize) < sizeof *pnewnode)
+    if ((size_t)(1 << pavailnode->logsize) < sizeof *pnewnode)
         return NULL;
     pnewnode = (blknode_t *)((char *)pavailnode + (1 << pavailnode->logsize));
     pnewnode->ptr = (char *)pnewnode + sizeof *pnewnode;
diff --git a/malloc/mpool.h b/malloc/mpool.h
index d0faed4..667377c 100644
--- a/malloc/mpool.h
+++ b/malloc/mpool.h
@@ -23,10 +23,10 @@
 #define MPOOL_MAKE_LEFT(pnode) pnode->flags &= ~MP_NODE_LR
 #define MPOOL_MAKE_RIGHT(pnode) pnode->flags |= MP_NODE_LR
 
-#define MPOOL_IS_AVAIL(pnode) (pnode->flags & MP_NODE_AVAIL)
-#define MPOOL_IS_USED(pnode) ((pnode->flags & MP_NODE_AVAIL) == 0)
-#define MPOOL_IS_LEFT(pnode) ((pnode->flags & MP_NODE_LR) == 0)
-#define MPOOL_IS_RIGHT(pnode) (pnode->flags & MP_NODE_LR)
+#define MPOOL_IS_AVAIL(pnode) ((pnode->flags & MP_NODE_AVAIL) != 0)
+#define MPOOL_IS_USED(pnode)  ((pnode->flags & MP_NODE_AVAIL) == 0)
+#define MPOOL_IS_LEFT(pnode)  ((pnode->flags & MP_NODE_LR) == 0)
+#define MPOOL_IS_RIGHT(pnode) ((pnode->flags & MP_NODE_LR) != 0)
 
 typedef struct blknode {
     unsigned char flags;    /* availability, left-right buddiness, inheritance */
-- 
2.11.4.GIT