From 29126a98fe7a8f75695910bdf8fa1ccc6ff67288 Mon Sep 17 00:00:00 2001 From: Caoruihong Date: Fri, 22 Oct 2021 22:39:36 +0800 Subject: [PATCH] fix: fix compile warning saying dereference void * pointer Signed-off-by: Caoruihong --- utils/internal/los_hook_types.h | 13 +++++++------ utils/internal/los_hook_types_parse.h | 1 + 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/utils/internal/los_hook_types.h b/utils/internal/los_hook_types.h index bd4165e1..fac571ab 100644 --- a/utils/internal/los_hook_types.h +++ b/utils/internal/los_hook_types.h @@ -49,14 +49,15 @@ extern "C" { #endif /* __cplusplus */ #if (LOSCFG_DEBUG_HOOK == 1) +typedef VOID *VOID_PTR; #define LOS_HOOK_ALL_TYPES_DEF \ /* 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_DEINIT, (VOID *pool)) \ - LOS_HOOK_TYPE_DEF(LOS_HOOK_TYPE_MEM_ALLOC, (VOID *pool, VOID *ptr, UINT32 size)) \ - LOS_HOOK_TYPE_DEF(LOS_HOOK_TYPE_MEM_FREE, (VOID *pool, VOID *ptr)) \ - LOS_HOOK_TYPE_DEF(LOS_HOOK_TYPE_MEM_REALLOC, (VOID *pool, VOID *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_INIT, (VOID_PTR pool, UINT32 size)) \ + LOS_HOOK_TYPE_DEF(LOS_HOOK_TYPE_MEM_DEINIT, (VOID_PTR pool)) \ + 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_PTR pool, VOID_PTR ptr)) \ + 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_PTR pool, VOID_PTR ptr, UINT32 size, UINT32 boundary)) \ /* 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_READ, (PEVENT_CB_S eventCB, UINT32 eventMask, UINT32 mode, \ diff --git a/utils/internal/los_hook_types_parse.h b/utils/internal/los_hook_types_parse.h index cd01859d..9b80fb12 100644 --- a/utils/internal/los_hook_types_parse.h +++ b/utils/internal/los_hook_types_parse.h @@ -50,6 +50,7 @@ #define ARG_CP_LosQueueCB ADDR( #define ARG_CP_SWTMR_CTRL_S ADDR( #define ARG_UINT32 ARGS( +#define ARG_VOID_PTR ARGS( #define ARG_PEVENT_CB_S ARGS( #define ARG_void ADDRn( #define ARG(a) ARG_##a)