yystopf
/
openharmony_kernel_liteos_m
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!370 修正编译告警称解引用void指针 

Merge pull request !370 from Caoruihong/void_ptr
This commit is contained in:
openharmony_ci 2021-11-05 13:45:54 +00:00 committed by Gitee
parent f3631fa266 29126a98fe
commit c488edd707
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
utils/internal/los_hook_types.h
View File

@ -49,14 +49,15 @@ extern "C" {
#endif /* __cplusplus */ #endif /* __cplusplus */
#if (LOSCFG_DEBUG_HOOK == 1) #if (LOSCFG_DEBUG_HOOK == 1)
typedef VOID *VOID_PTR;
#define LOS_HOOK_ALL_TYPES_DEF \ #define LOS_HOOK_ALL_TYPES_DEF \
/* Hook types supported by memory modules */ \ /* Hook types supported by memory modules */ \
LOS_HOOK_TYPE_DEF(LOS_HOOK_TYPE_MEM_INIT, (VOID *pool, UINT32 size)) \ LOS_HOOK_TYPE_DEF(LOS_HOOK_TYPE_MEM_INIT, (VOID_PTR pool, UINT32 size)) \
LOS_HOOK_TYPE_DEF(LOS_HOOK_TYPE_MEM_DEINIT, (VOID *pool)) \ LOS_HOOK_TYPE_DEF(LOS_HOOK_TYPE_MEM_DEINIT, (VOID_PTR pool)) \
LOS_HOOK_TYPE_DEF(LOS_HOOK_TYPE_MEM_ALLOC, (VOID *pool, VOID *ptr, UINT32 size)) \ LOS_HOOK_TYPE_DEF(LOS_HOOK_TYPE_MEM_ALLOC, (VOID_PTR pool, VOID_PTR ptr, UINT32 size)) \
LOS_HOOK_TYPE_DEF(LOS_HOOK_TYPE_MEM_FREE, (VOID *pool, VOID *ptr)) \ LOS_HOOK_TYPE_DEF(LOS_HOOK_TYPE_MEM_FREE, (VOID_PTR pool, VOID_PTR ptr)) \
LOS_HOOK_TYPE_DEF(LOS_HOOK_TYPE_MEM_REALLOC, (VOID *pool, VOID *ptr, UINT32 size)) \ LOS_HOOK_TYPE_DEF(LOS_HOOK_TYPE_MEM_REALLOC, (VOID_PTR pool, VOID_PTR ptr, UINT32 size)) \
LOS_HOOK_TYPE_DEF(LOS_HOOK_TYPE_MEM_ALLOCALIGN, (VOID *pool, VOID *ptr, UINT32 size, UINT32 boundary)) \ LOS_HOOK_TYPE_DEF(LOS_HOOK_TYPE_MEM_ALLOCALIGN, (VOID_PTR pool, VOID_PTR ptr, UINT32 size, UINT32 boundary)) \
/* Hook types supported by event modules */ \ /* Hook types supported by event modules */ \
LOS_HOOK_TYPE_DEF(LOS_HOOK_TYPE_EVENT_INIT, (PEVENT_CB_S eventCB)) \ LOS_HOOK_TYPE_DEF(LOS_HOOK_TYPE_EVENT_INIT, (PEVENT_CB_S eventCB)) \
LOS_HOOK_TYPE_DEF(LOS_HOOK_TYPE_EVENT_READ, (PEVENT_CB_S eventCB, UINT32 eventMask, UINT32 mode, \ LOS_HOOK_TYPE_DEF(LOS_HOOK_TYPE_EVENT_READ, (PEVENT_CB_S eventCB, UINT32 eventMask, UINT32 mode, \

1
utils/internal/los_hook_types_parse.h
View File

@ -50,6 +50,7 @@
#define ARG_CP_LosQueueCB ADDR( #define ARG_CP_LosQueueCB ADDR(
#define ARG_CP_SWTMR_CTRL_S ADDR( #define ARG_CP_SWTMR_CTRL_S ADDR(
#define ARG_UINT32 ARGS( #define ARG_UINT32 ARGS(
#define ARG_VOID_PTR ARGS(
#define ARG_PEVENT_CB_S ARGS( #define ARG_PEVENT_CB_S ARGS(
#define ARG_void ADDRn( #define ARG_void ADDRn(
#define ARG(a) ARG_##a) #define ARG(a) ARG_##a)