Module: kamailio Branch: master Commit: 587e24a48094ad672aa625461a69363219de6922 URL: https://github.com/kamailio/kamailio/commit/587e24a48094ad672aa625461a69363… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-06-08T10:04:08+02:00 core: mem - use size_t for tlsf memory management functions --- Modified: mem/tlsf_malloc.c --- Diff: https://github.com/kamailio/kamailio/commit/587e24a48094ad672aa625461a69363… Patch: https://github.com/kamailio/kamailio/commit/587e24a48094ad672aa625461a69363… --- diff --git a/mem/tlsf_malloc.c b/mem/tlsf_malloc.c index 85afcff..73ae412 100644 --- a/mem/tlsf_malloc.c +++ b/mem/tlsf_malloc.c @@ -1370,7 +1370,7 @@ static tlsf_t _tlsf_shm_block = 0; /*SHM wrappers to sync the access to memory block*/ #ifdef DBG_TLSF_MALLOC -void* tlsf_shm_malloc(void* tlsfmp, unsigned long size, +void* tlsf_shm_malloc(void* tlsfmp, size_t size, const char* file, const char* func, unsigned int line, const char* mname) { void *r; @@ -1379,7 +1379,7 @@ void* tlsf_shm_malloc(void* tlsfmp, unsigned long size, shm_unlock(); return r; } -void* tlsf_shm_realloc(void* tlsfmp, void* p, unsigned long size, +void* tlsf_shm_realloc(void* tlsfmp, void* p, size_t size, const char* file, const char* func, unsigned int line, const char* mname) { void *r; @@ -1388,7 +1388,7 @@ void* tlsf_shm_realloc(void* tlsfmp, void* p, unsigned long size, shm_unlock(); return r; } -void* tlsf_shm_resize(void* tlsfmp, void* p, unsigned long size, +void* tlsf_shm_resize(void* tlsfmp, void* p, size_t size, const char* file, const char* func, unsigned int line, const char* mname) { void *r; @@ -1406,7 +1406,7 @@ void tlsf_shm_free(void* tlsfmp, void* p, const char* file, const char* func, shm_unlock(); } #else -void* tlsf_shm_malloc(void* tlsfmp, unsigned long size) +void* tlsf_shm_malloc(void* tlsfmp, size_t size) { void *r; shm_lock(); @@ -1414,7 +1414,7 @@ void* tlsf_shm_malloc(void* tlsfmp, unsigned long size) shm_unlock(); return r; } -void* tlsf_shm_realloc(void* tlsfmp, void* p, unsigned long size) +void* tlsf_shm_realloc(void* tlsfmp, void* p, size_t size) { void *r; shm_lock(); @@ -1422,7 +1422,7 @@ void* tlsf_shm_realloc(void* tlsfmp, void* p, unsigned long size) shm_unlock(); return r; } -void* tlsf_shm_resize(void* tlsfmp, void* p, unsigned long size) +void* tlsf_shm_resize(void* tlsfmp, void* p, size_t size) { void *r; shm_lock();