diff --git a/interfaces/innerkits/init_module_engine/init_modulemgr.c b/interfaces/innerkits/init_module_engine/init_modulemgr.c index 3fa22b28632f176c0b4c71ea2fd347d234d77e25..f1e8c08f0fa54f9e34d900eb6d85719c919bb439 100644 --- a/interfaces/innerkits/init_module_engine/init_modulemgr.c +++ b/interfaces/innerkits/init_module_engine/init_modulemgr.c @@ -87,7 +87,7 @@ static int moduleMgrCommandsInit(const HOOK_INFO *info, void *cookie) static int loadAutorunModules(const HOOK_INFO *info, void *cookie) { autorunModuleMgr = ModuleMgrScan("init/autorun"); - INIT_LOGV("Load autorun modules return %p", autorunModuleMgr); + INIT_LOGV("Load autorun modules return autorunModuleMgr"); return 0; } diff --git a/services/init/init_group_manager.c b/services/init/init_group_manager.c index 0fe1aad08fc33dcb27df7962ca552a7612704561..96dba8c17d3542e482ffe9f3a109cdcf77878ac1 100644 --- a/services/init/init_group_manager.c +++ b/services/init/init_group_manager.c @@ -229,7 +229,7 @@ InitGroupNode *AddGroupNode(int type, const char *name) if (groupNode != NULL) { return groupNode; } - INIT_LOGV("AddGroupNode type %d %p name %s", type, g_initWorkspace.hashMap[type], name); + INIT_LOGV("AddGroupNode type %d name %s", type, name); uint32_t nameLen = (uint32_t)strlen(name); groupNode = (InitGroupNode *)calloc(1, sizeof(InitGroupNode) + nameLen + 1); INIT_ERROR_CHECK(groupNode != NULL, return NULL, "Failed to alloc for group %s", name); @@ -272,7 +272,7 @@ void DelGroupNode(int type, const char *name) if (type >= NODE_TYPE_GROUPS) { return; } - INIT_LOGV("DelGroupNode type %d %p name %s", type, g_initWorkspace.hashMap[type], name); + INIT_LOGV("DelGroupNode type %d name %s", type, name); OH_HashMapRemove(g_initWorkspace.hashMap[type], name); InitGroupNode *groupNode = g_initWorkspace.groupNodes[type]; InitGroupNode *preNode = groupNode; diff --git a/services/loopevent/task/le_task.c b/services/loopevent/task/le_task.c index 190c14cf361afc78f355fff872251464eccaefb6..16386f7f5fd45ea7307b2d61b19fafa3594dd528 100644 --- a/services/loopevent/task/le_task.c +++ b/services/loopevent/task/le_task.c @@ -55,7 +55,7 @@ BaseTask *CreateTask(const LoopHandle loopHandle, int fd, const LE_BaseInfo *inf void CloseTask(const LoopHandle loopHandle, BaseTask *task) { - LE_LOGV("CloseTask %p", task); + LE_LOGV("CloseTask"); LE_CHECK(loopHandle != NULL && task != NULL, return, "Invalid parameters"); if (CheckTaskFlags(task, TASK_STREAM | TASK_CONNECT) || CheckTaskFlags(task, TASK_EVENT | TASK_ASYNC_EVENT)) { @@ -189,7 +189,7 @@ LE_STATUS LE_Send(const LoopHandle loopHandle, void LE_CloseTask(const LoopHandle loopHandle, const TaskHandle taskHandle) { LE_CHECK(loopHandle != NULL && taskHandle != NULL, return, "Invalid parameters"); - LE_LOGV("LE_CloseTask %d %p", GetSocketFd(taskHandle), taskHandle); + LE_LOGV("LE_CloseTask %d", GetSocketFd(taskHandle)); BaseTask *task = (BaseTask *)taskHandle; if (task->innerClose != NULL) { task->innerClose(loopHandle, taskHandle); diff --git a/services/param/trigger/trigger_manager.c b/services/param/trigger/trigger_manager.c index f854b2836cd4a60a474c92452359773f7bcbf779..c6447176b07781f3ef6ecbab1dc232cc5590879b 100644 --- a/services/param/trigger/trigger_manager.c +++ b/services/param/trigger/trigger_manager.c @@ -711,7 +711,7 @@ void ClearWatchTrigger(ParamWatcher *watcher, int type) PARAM_LOGE("ClearWatchTrigger %s error type %d", GetTriggerName(trigger), type); return; } - PARAM_LOGV("ClearWatchTrigger %p %s", trigger, GetTriggerName(trigger)); + PARAM_LOGV("ClearWatchTrigger %s", GetTriggerName(trigger)); ListNode *next = node->next; FreeTrigger(GetTriggerWorkSpace(), trigger); node = next; diff --git a/services/param/watcher/agent/watcher_manager_kits.cpp b/services/param/watcher/agent/watcher_manager_kits.cpp index 067fdb48fa0603dd0af2ae03af9d30fd77da39a2..971bd174a426a1a5e0b6e86e7d071584035b304e 100644 --- a/services/param/watcher/agent/watcher_manager_kits.cpp +++ b/services/param/watcher/agent/watcher_manager_kits.cpp @@ -233,8 +233,7 @@ void WatcherManagerKits::ParamWatcher::RemoveParameterListener(uint32_t idx) int WatcherManagerKits::ParamWatcher::AddParameterListener(ParameterChangePtr callback, void *context) { WATCHER_CHECK(callback != nullptr, return -1, "Invalid callback "); - WATCHER_LOGV("AddParameterListener %s listenerId_ %d callback %p context %p", - keyPrefix_.c_str(), listenerId_, callback, context); + WATCHER_LOGV("AddParameterListener %s listenerId_ %d", keyPrefix_.c_str(), listenerId_); for (auto it = parameterChangeListeners.begin(); it != parameterChangeListeners.end(); it++) { if (it->second == nullptr) { continue; @@ -261,7 +260,7 @@ int WatcherManagerKits::ParamWatcher::DelParameterListener(ParameterChangePtr ca ParameterChangeListener *listener = GetParameterListener(&index); while (listener != nullptr) { if (listener->IsEqual(callback, context)) { - WATCHER_LOGV("DelParameterListener listenerId_ %d callback %p context %p", index, callback, context); + WATCHER_LOGV("DelParameterListener listenerId_ %d", index); RemoveParameterListener(index); break; } diff --git a/test/moduletest/hookmgr_moduletest.cpp b/test/moduletest/hookmgr_moduletest.cpp index e5659cbb2ade840ce469712cc2ec49fcd4396269..a72ac02c419edca04a9eca16d6e1930038be8d9f 100644 --- a/test/moduletest/hookmgr_moduletest.cpp +++ b/test/moduletest/hookmgr_moduletest.cpp @@ -63,7 +63,7 @@ static int OhosTestHookMultiThreadAnother(const HOOK_INFO *hookInfo, void *execu static void OhosHookPrint(const HOOK_INFO *hookInfo, void *traversalCookie) { - printf("\tstage[%02d] prio[%02d] hook[%p].\n", hookInfo->stage, hookInfo->prio, hookInfo->hook); + printf("\tstage[%02d] prio[%02d].\n", hookInfo->stage, hookInfo->prio); } static void DumpAllHooks(HOOK_MGR *hookMgr) diff --git a/test/unittest/innerkits/hookmgr_unittest.cpp b/test/unittest/innerkits/hookmgr_unittest.cpp index c0473b3539dacc1323c25519780509b5e55d52d2..c97151b0528fbfd78af3c243bcd7b98e7d7142b8 100755 --- a/test/unittest/innerkits/hookmgr_unittest.cpp +++ b/test/unittest/innerkits/hookmgr_unittest.cpp @@ -67,7 +67,7 @@ static int OhosTestHookRetOKEx2(const HOOK_INFO *hookInfo, void *executionContex static void OhosHookPrint(const HOOK_INFO *hookInfo, void *traversalCookie) { - printf("\tstage[%02d] prio[%02d] hook[%p].\n", hookInfo->stage, hookInfo->prio, hookInfo->hook); + printf("\tstage[%02d] prio[%02d].\n", hookInfo->stage, hookInfo->prio); } static void dumpAllHooks(HOOK_MGR *hookMgr) diff --git a/test/unittest/loopevent/loopserver_unittest.cpp b/test/unittest/loopevent/loopserver_unittest.cpp index cabb70a2741049786a00bc4d05494e79c74b2f81..cc2234a752d2e318fc4dd0dbcc2f3baf61fe15bb 100644 --- a/test/unittest/loopevent/loopserver_unittest.cpp +++ b/test/unittest/loopevent/loopserver_unittest.cpp @@ -253,11 +253,11 @@ public: ret = LE_CreateStreamServer(g_loopServer_, &pipeServer, &info); EXPECT_EQ(ret, 0); - printf("Run server pipeServer_ %p \n", pipeServer); + printf("Run server pipeServer_ \n"); // run loop for server LE_RunLoop(g_loopServer_); - printf("Run server pipeServer_ %p \n", pipeServer); + printf("Run server pipeServer_ \n"); LE_CloseStreamTask(g_loopServer_, pipeServer); pipeServer = nullptr; LE_CloseStreamTask(g_loopServer_, tcpServer);