diff options
| author | Amaury Pouly <amaury.pouly@gmail.com> | 2017-01-16 00:10:38 +0100 |
|---|---|---|
| committer | Gerrit Rockbox <gerrit@rockbox.org> | 2017-02-04 17:24:47 +0100 |
| commit | d7871914acd2ed77f43344e36e08944524a67d9e (patch) | |
| tree | 7bcef243d9b53c3703c305b8a5f9f8a8488eabfb /lib/tlsf | |
| parent | 1245c5fe61f6ca8e1980a33a8b8f7ea4322829fd (diff) | |
Fix dangerous casts
On Windows 64-bit, the size of long is 32-bit, thus any pointer to long cast is
not valid. In any case, one should use intptr_t and ptrdiff_t when casting
to integers. This commit attempts to fix all instances reported by GCC.
When relevant, I replaced code by the macros PTR_ADD, ALIGN_UP from system.h
Change-Id: I2273b0e8465d3c4689824717ed5afa5ed238a2dc
Diffstat (limited to 'lib/tlsf')
| -rw-r--r-- | lib/tlsf/src/tlsf.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/tlsf/src/tlsf.c b/lib/tlsf/src/tlsf.c index 6866f0c9b0..136c4152c0 100644 --- a/lib/tlsf/src/tlsf.c +++ b/lib/tlsf/src/tlsf.c @@ -54,6 +54,7 @@ #include <stdio.h> #include <string.h> +#include <stdint.h> #ifndef TLSF_USE_LOCKS #define TLSF_USE_LOCKS (0) @@ -462,7 +463,7 @@ size_t init_memory_pool(size_t mem_pool_size, void *mem_pool) return -1; } - if (((unsigned long) mem_pool & PTR_MASK)) { + if (((intptr_t) mem_pool & PTR_MASK)) { ERROR_MSG("init_memory_pool (): mem_pool must be aligned to a word\n"); return -1; } @@ -522,7 +523,7 @@ size_t add_new_area(void *area, size_t area_size, void *mem_pool) lb1 = ptr->end; /* Merging the new area with the next physically contigous one */ - if ((unsigned long) ib1 == (unsigned long) lb0 + BHDR_OVERHEAD) { + if ((uintptr_t) ib1 == (uintptr_t) lb0 + BHDR_OVERHEAD) { if (tlsf->area_head == ptr) { tlsf->area_head = ptr->next; ptr = ptr->next; @@ -543,7 +544,7 @@ size_t add_new_area(void *area, size_t area_size, void *mem_pool) /* Merging the new area with the previous physically contigous one */ - if ((unsigned long) lb1->ptr.buffer == (unsigned long) ib0) { + if ((intptr_t) lb1->ptr.buffer == (intptr_t) ib0) { if (tlsf->area_head == ptr) { tlsf->area_head = ptr->next; ptr = ptr->next; |