libs/rt-thread-official
libs
/
rt-thread-official
mirror of https://github.com/RT-Thread/rt-thread.git
4
0
Fork 0
Code Issues Releases Wiki Activity

[Better style] Unify the function declaration and definition paramete… (#7432)

This commit is contained in:
dejavudwh 2023-05-01 07:35:03 +08:00 committed by GitHub
parent d580042145
commit e12c2f9306
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/rtthread.h
View File

@ -272,9 +272,9 @@ void rt_mp_free_sethook(void (*hook)(struct rt_mempool *mp, void *block));
*/ */
void rt_system_heap_init(void *begin_addr, void *end_addr); void rt_system_heap_init(void *begin_addr, void *end_addr);
void *rt_malloc(rt_size_t nbytes); void *rt_malloc(rt_size_t size);
void rt_free(void *ptr); void rt_free(void *ptr);
void *rt_realloc(void *ptr, rt_size_t nbytes); void *rt_realloc(void *ptr, rt_size_t newsize);
void *rt_calloc(rt_size_t count, rt_size_t size); void *rt_calloc(rt_size_t count, rt_size_t size);
void *rt_malloc_align(rt_size_t size, rt_size_t align); void *rt_malloc_align(rt_size_t size, rt_size_t align);
void rt_free_align(void *ptr); void rt_free_align(void *ptr);

16
src/kservice.c
View File

@ -1692,13 +1692,13 @@ RTM_EXPORT(rt_malloc);
/** /**
* @brief This function will change the size of previously allocated memory block. * @brief This function will change the size of previously allocated memory block.
* *
* @param rmem is the pointer to memory allocated by rt_malloc. * @param ptr is the pointer to memory allocated by rt_malloc.
* *
* @param newsize is the required new size. * @param newsize is the required new size.
* *
* @return the changed memory block address. * @return the changed memory block address.
*/ */
rt_weak void *rt_realloc(void *rmem, rt_size_t newsize) rt_weak void *rt_realloc(void *ptr, rt_size_t newsize)
{ {
rt_base_t level; rt_base_t level;
void *nptr; void *nptr;
@ -1706,7 +1706,7 @@ rt_weak void *rt_realloc(void *rmem, rt_size_t newsize)
/* Enter critical zone */ /* Enter critical zone */
level = _heap_lock(); level = _heap_lock();
/* Change the size of previously allocated memory block */ /* Change the size of previously allocated memory block */
nptr = _MEM_REALLOC(rmem, newsize); nptr = _MEM_REALLOC(ptr, newsize);
/* Exit critical zone */ /* Exit critical zone */
_heap_unlock(level); _heap_unlock(level);
return nptr; return nptr;
@ -1745,19 +1745,19 @@ RTM_EXPORT(rt_calloc);
* @brief This function will release the previously allocated memory block by * @brief This function will release the previously allocated memory block by
* rt_malloc. The released memory block is taken back to system heap. * rt_malloc. The released memory block is taken back to system heap.
* *
* @param rmem the address of memory which will be released. * @param ptr the address of memory which will be released.
*/ */
rt_weak void rt_free(void *rmem) rt_weak void rt_free(void *ptr)
{ {
rt_base_t level; rt_base_t level;
/* call 'rt_free' hook */ /* call 'rt_free' hook */
RT_OBJECT_HOOK_CALL(rt_free_hook, (rmem)); RT_OBJECT_HOOK_CALL(rt_free_hook, (ptr));
/* NULL check */ /* NULL check */
if (rmem == RT_NULL) return; if (ptr == RT_NULL) return;
/* Enter critical zone */ /* Enter critical zone */
level = _heap_lock(); level = _heap_lock();
_MEM_FREE(rmem); _MEM_FREE(ptr);
/* Exit critical zone */ /* Exit critical zone */
_heap_unlock(level); _heap_unlock(level);
} }