rsys

commit 8bd08aa05bcffbcdc5b32a9d9a14cf2e9b02e37b
parent 7d981f383b6bacf2e334619d27d6bee967b4b156
Author: vaplv <vaplv@free.fr>
Date:   Wed, 22 Nov 2017 21:41:24 +0100

Fix warns in LIFO allocator when compiled in 32 bits

Diffstat:
M
src/mem_lifo_allocator.c
 | 
10
+++++-----

1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/mem_lifo_allocator.c b/src/mem_lifo_allocator.c
@@ -80,7 +80,7 @@ lifo_alloc_aligned
   data_size = ALIGN_SIZE(size, sizeof(int64_t));
   entry_size = header_size + data_size + footer_size;
 
-  ASSERT(data_size < (((int64_t)1<<48)-1));
+  ASSERT(data_size < (size_t)(((int64_t)1<<48)-1));
   ASSERT(header_size < (1<<16)-1);
   header = (int64_t)data_size | ((int64_t)header_size<<48);
   footer = (int64_t)data_size | ((int64_t)1<<48);
@@ -143,7 +143,7 @@ lifo_free(void* data, void* mem)
 
   ptr = mem;
   header = *(int64_t*)(ptr-sizeof(int64_t));
-  data_size = header & (((int64_t)1<<48)-1);
+  data_size = (size_t)(header & (((int64_t)1<<48)-1));
   pfooter = (int64_t*)(ptr + data_size);
   end = ptr + data_size + sizeof(int64_t);
 
@@ -160,7 +160,7 @@ lifo_free(void* data, void* mem)
       footer = *(int64_t*)ptr;
       if(footer & ((int64_t)1<<48)) break; /* In use */
 
-      data_size = footer & (((int64_t)1<<48)-1);
+      data_size = (size_t)(footer & (((int64_t)1<<48)-1));
       ptr -= data_size;
 
       header = *(int64_t*)(ptr-sizeof(int64_t));
@@ -226,8 +226,8 @@ lifo_dump(const void* data, char* dump, const size_t max_dump_len)
 {
   size_t len;
 
-  len = (size_t)snprintf
-    (dump, max_dump_len, "%lu bytes allocated.", lifo_allocated_size(data));
+  len = (size_t)snprintf(dump, max_dump_len, "%lu bytes allocated.",
+    (unsigned long)lifo_allocated_size(data));
   if(len >= (max_dump_len-1)) /* -1 <=> null char */
     dump[max_dump_len-1] = '\0';
   return len;