mem: align all prototypes for realloc functions

(cherry picked from commit 379dada)
OpenSIPS · Jan 12, 2023 · c4741cb · c4741cb
1 parent 97af522
commit c4741cb
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/mem/mem.h b/mem/mem.h
@@ -145,7 +145,7 @@ inline static void *pkg_malloc_func(unsigned long size,
 	return PKG_MALLOC_(mem_block, size, file, function, line);
 }
 
-inline static void* pkg_realloc_func(void *ptr, unsigned int size,
+inline static void* pkg_realloc_func(void *ptr, unsigned long size,
 		const char* file, const char* function, unsigned int line)
 {
 	return PKG_REALLOC(mem_block, ptr, size, file, function, line);
@@ -166,7 +166,7 @@ inline static void *pkg_malloc_func(unsigned long size)
 	return PKG_MALLOC_(mem_block, size);
 }
 
-inline static void* pkg_realloc_func(void *ptr, unsigned int size)
+inline static void* pkg_realloc_func(void *ptr, unsigned long size)
 {
 	return PKG_REALLOC(mem_block, ptr, size);
 }

diff --git a/mem/mem_funcs.h b/mem/mem_funcs.h
@@ -24,7 +24,7 @@
 #ifdef DBG_MALLOC
 typedef void *(*osips_malloc_f) (unsigned long size,
                       const char *file, const char *func, unsigned int line);
-typedef void *(*osips_realloc_f) (void *ptr, unsigned int size,
+typedef void *(*osips_realloc_f) (void *ptr, unsigned long size,
                       const char *file, const char *func, unsigned int line);
 typedef void (*osips_free_f) (void *ptr,
                       const char *file, const char *func, unsigned int line);
@@ -36,7 +36,7 @@ typedef void (*osips_free_f) (void *ptr,
 		__FILE__, __FUNCTION__, __LINE__ )
 #else
 typedef void *(*osips_malloc_f) (unsigned long size);
-typedef void *(*osips_realloc_f) (void *ptr, unsigned int size);
+typedef void *(*osips_realloc_f) (void *ptr, unsigned long size);
 typedef void (*osips_free_f) (void *ptr);
 #define func_malloc(_func, _size) (_func)(_size)
 #define func_realloc(_func, _ptr, _size) (_func)(_ptr, _size)

diff --git a/mem/rpm_mem.h b/mem/rpm_mem.h
@@ -209,7 +209,7 @@ inline static void* _rpm_malloc(unsigned long size,
 }
 
 
-inline static void* _rpm_realloc(void *ptr, unsigned int size,
+inline static void* _rpm_realloc(void *ptr, unsigned long size,
 		const char* file, const char* function, unsigned int line )
 {
 	void *p;
@@ -276,7 +276,7 @@ inline static void* rpm_malloc(unsigned long size)
 }
 
 #define rpm_realloc_func		rpm_realloc
-inline static void* rpm_realloc(void *ptr, unsigned int size)
+inline static void* rpm_realloc(void *ptr, unsigned long size)
 {
 	void *p;
 

diff --git a/mem/shm_mem.h b/mem/shm_mem.h
@@ -363,7 +363,7 @@ inline static void* _shm_malloc_bulk(unsigned long size,
 	return p;
 }
 
-inline static void* _shm_realloc(void *ptr, unsigned int size, 
+inline static void* _shm_realloc(void *ptr, unsigned long size,
 		const char* file, const char* function, unsigned int line )
 {
 	void *p;
@@ -398,8 +398,8 @@ inline static void* _shm_realloc(void *ptr, unsigned int size,
 	return p;
 }
 
-inline static void* _shm_realloc_unsafe(void *ptr, unsigned int size, 
-		const char* file, const char* function, int line )
+inline static void* _shm_realloc_unsafe(void *ptr, unsigned long size,
+		const char* file, const char* function, unsigned int line )
 {
 	void *p;
 
@@ -590,7 +590,7 @@ inline static void* shm_malloc_bulk(unsigned long size)
 }
 
 #define shm_realloc_func shm_realloc
-inline static void* shm_realloc(void *ptr, unsigned int size)
+inline static void* shm_realloc(void *ptr, unsigned long size)
 {
 	void *p;
 
@@ -625,7 +625,7 @@ inline static void* shm_realloc(void *ptr, unsigned int size)
 }
 
 #define shm_realloc_func_unsafe shm_realloc_unsafe
-inline static void* shm_realloc_unsafe(void *ptr, unsigned int size)
+inline static void* shm_realloc_unsafe(void *ptr, unsigned long size)
 {
 	void *p;
 #ifdef SHM_EXTRA_STATS