diff --git a/samgr/source/message.c b/samgr/source/message.c index 3c31c27..c35e761 100755 --- a/samgr/source/message.c +++ b/samgr/source/message.c @@ -125,7 +125,7 @@ uint32 *SAMGR_SendSharedRequest(const Identity *identity, const Request *request exchange.id.queueId = NULL; int32 err = SharedSend(identity->queueId, &exchange, 0); if (err != EC_SUCCESS) { - HILOG_ERROR(HILOG_MODULE_SAMGR, "SharedSend [%p] failed(%d)!", identity->queueId, err); + HILOG_ERROR(HILOG_MODULE_SAMGR, "SharedSend failed(%d)!", err); (void)FreeReference(&exchange); } return exchange.sharedRef; @@ -154,7 +154,7 @@ int32 SAMGR_SendSharedDirectRequest(const Identity *id, const Request *req, cons exchange.id.queueId = NULL; int32 err = SharedSend(id->queueId, &exchange, 0); if (err != EC_SUCCESS) { - HILOG_ERROR(HILOG_MODULE_SAMGR, "SharedSend [%p] failed(%d)!", id->queueId, err); + HILOG_ERROR(HILOG_MODULE_SAMGR, "SharedSend failed(%d)!", err); (void)FreeReference(&exchange); } *ref = exchange.sharedRef; diff --git a/samgr/source/samgr_lite.c b/samgr/source/samgr_lite.c index dd7e0c4..1f2edc4 100755 --- a/samgr/source/samgr_lite.c +++ b/samgr/source/samgr_lite.c @@ -193,7 +193,7 @@ static void InitializeAllServices(Vector *services) const char *name = serviceImpl->service->GetName(serviceImpl->service); AddTaskPool(serviceImpl, &config, name); - HILOG_INFO(HILOG_MODULE_SAMGR, "Init service:%s TaskPool:%p", name, serviceImpl->taskPool); + HILOG_INFO(HILOG_MODULE_SAMGR, "Init service:%s", name); InitializeSingleService(serviceImpl); } SamgrLiteImpl *samgr = GetImplement(); @@ -447,7 +447,7 @@ static void AddTaskPool(ServiceImpl *service, TaskConfig *cfg, const char *name) } service->taskPool = samgr->sharedPool[pos]; if (SAMGR_ReferenceTaskPool(service->taskPool) == NULL) { - HILOG_ERROR(HILOG_MODULE_SAMGR, "shared task:%p pri:%d ref is full", service->taskPool, cfg->priority); + HILOG_ERROR(HILOG_MODULE_SAMGR, "pri:%d ref is full", cfg->priority); samgr->sharedPool[pos] = NULL; } } @@ -501,8 +501,8 @@ static void HandleInitRequest(const Request *request, const Response *response) { ServiceImpl *serviceImpl = (ServiceImpl *)request->data; if (serviceImpl == NULL) { - HILOG_ERROR(HILOG_MODULE_SAMGR, "Init service Request:<%d,%d>, Response:<%p,%d>!", - request->msgId, request->msgValue, response->data, response->len); + HILOG_ERROR(HILOG_MODULE_SAMGR, "Init service Request:<%d,%d>, Response:<%d>!", + request->msgId, request->msgValue, response->len); return; } uint32 lastTime = serviceImpl->ops.timestamp; diff --git a/samgr_client/source/remote_register.c b/samgr_client/source/remote_register.c index 71b453d..11531e5 100755 --- a/samgr_client/source/remote_register.c +++ b/samgr_client/source/remote_register.c @@ -77,8 +77,7 @@ IUnknown *SAMGR_FindServiceApi(const char *service, const char *feature) } VECTOR_Add(&g_remoteRegister.clients, proxy); MUTEX_Unlock(g_remoteRegister.mtx); - HILOG_INFO(HILOG_MODULE_SAMGR, "Create remote sa proxy[%p]<%s, %s>!", - proxy, service, feature); + HILOG_INFO(HILOG_MODULE_SAMGR, "Create remote sa proxy<%s, %s>!", service, feature); return proxy; } diff --git a/samgr_endpoint/source/endpoint.c b/samgr_endpoint/source/endpoint.c index 170894a..371a0cb 100755 --- a/samgr_endpoint/source/endpoint.c +++ b/samgr_endpoint/source/endpoint.c @@ -123,8 +123,8 @@ int SAMGR_AddRouter(Endpoint *endpoint, const SaName *saName, const Identity *id Router *router = SAMGR_Malloc(sizeof(Router)); if (router == NULL) { - HILOG_ERROR(HILOG_MODULE_SAMGR, "Memory is not enough! Identity<%d, %d, %p>", - id->serviceId, id->featureId, id->queueId); + HILOG_ERROR(HILOG_MODULE_SAMGR, "Memory is not enough! Identity<%d, %d>", + id->serviceId, id->featureId); return EC_NOMEMORY; } router->saName = *saName; @@ -234,7 +234,7 @@ static int32 ParseGetAllSysCapsReply(IpcIo *reply, char sysCaps[MAX_SYSCAP_NUM][ uint32 size = IpcIoPopUint32(reply); size = ((size > MAX_SYSCAP_NUM) ? MAX_SYSCAP_NUM : size); int cnt = *sysCapNum; - for (int i = 0; i < size; i++) { + for (uint32 i = 0; i < size; i++) { int len = 0; char *sysCap = (char *)IpcIoPopString(reply, &len); if (sysCap == NULL || len == 0) { @@ -423,8 +423,8 @@ static int Dispatch(const IpcContext *context, void *ipcMsg, IpcIo *data, void * uint32 *ref = NULL; int ret = SAMGR_SendSharedDirectRequest(&router->identity, &request, &resp, &ref, HandleIpc); if (ret != EC_SUCCESS) { - HILOG_ERROR(HILOG_MODULE_SAMGR, "Router[%u] Service<%d, %d, %p> is busy", - token, router->identity.serviceId, router->identity.featureId, router->identity.queueId); + HILOG_ERROR(HILOG_MODULE_SAMGR, "Router[%u] Service<%d, %d> is busy", + token, router->identity.serviceId, router->identity.featureId); goto ERROR; } #endif @@ -447,7 +447,7 @@ static void HandleIpc(const Request *request, const Response *response) if (router == NULL || router->proxy == NULL || router->proxy->Invoke == NULL) { FreeBuffer(endpoint->context, ipcMsg); - HILOG_ERROR(HILOG_MODULE_SAMGR, "Invalid IPC router<%p>!", router); + HILOG_ERROR(HILOG_MODULE_SAMGR, "Invalid IPC router!"); return; } diff --git a/samgr_server/source/samgr_server.c b/samgr_server/source/samgr_server.c index 107dd0b..f364cde 100755 --- a/samgr_server/source/samgr_server.c +++ b/samgr_server/source/samgr_server.c @@ -143,8 +143,8 @@ static TaskConfig GetTaskConfig(Service *service) static int32 Invoke(IServerProxy *iProxy, int funcId, void *origin, IpcIo *req, IpcIo *reply) { SamgrServer *server = GET_OBJECT(iProxy, SamgrServer, iUnknown); - int32 resource = IpcIoPopUint32(req); - int32 option = IpcIoPopUint32(req); + uint32_t resource = IpcIoPopUint32(req); + uint32_t option = IpcIoPopUint32(req); if (server == NULL || resource >= RES_BUTT || resource < 0 || g_functions[resource] == NULL) { HILOG_ERROR(HILOG_MODULE_SAMGR, "Invalid Msg<%d, %d, %d>", resource, option, funcId); return EC_INVALID;