diff --git a/frameworks/innerkitsimpl/distributeddatafwk/src/ikvstore_resultset.cpp b/frameworks/innerkitsimpl/distributeddatafwk/src/ikvstore_resultset.cpp index 72dd7171eca6f767828fc15c584cdf9a82eaa0de..920781a0caeaf1e1c2e9f9188c2162ff7627058f 100755 --- a/frameworks/innerkitsimpl/distributeddatafwk/src/ikvstore_resultset.cpp +++ b/frameworks/innerkitsimpl/distributeddatafwk/src/ikvstore_resultset.cpp @@ -317,7 +317,7 @@ int KvStoreResultSetStub::OnRemoteRequest(uint32_t code, MessageParcel &data, Me return GetEntryOnRemote(reply); } default: { - ZLOGW("OnRemoteRequest default %d", code); + ZLOGW("OnRemoteRequest default %u", code); MessageOption mo { MessageOption::TF_SYNC }; return IPCObjectStub::OnRemoteRequest(code, data, reply, mo); } diff --git a/frameworks/innerkitsimpl/distributeddatafwk/src/ikvstore_single.cpp b/frameworks/innerkitsimpl/distributeddatafwk/src/ikvstore_single.cpp index 396b2eae56be09e0282ed038d2ed6bb9d7c7351c..c606003b8cdcb3ebf5038bdb5e802dcaa101ae9d 100755 --- a/frameworks/innerkitsimpl/distributeddatafwk/src/ikvstore_single.cpp +++ b/frameworks/innerkitsimpl/distributeddatafwk/src/ikvstore_single.cpp @@ -1626,7 +1626,7 @@ int SingleKvStoreStub::OnSyncRequest(MessageParcel &data, MessageParcel &reply) int SingleKvStoreStub::OnRemoteRequest(uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option) { - ZLOGD("%{public}d", code); + ZLOGD("%{public}u", code); std::u16string descriptor = SingleKvStoreStub::GetDescriptor(); std::u16string remoteDescriptor = data.ReadInterfaceToken(); if (descriptor != remoteDescriptor) { diff --git a/frameworks/innerkitsimpl/distributeddatafwk/test/unittest/app_distributed_kv_store_test.cpp b/frameworks/innerkitsimpl/distributeddatafwk/test/unittest/app_distributed_kv_store_test.cpp index 36091ec719044a33bc8c713b418ba8ae94f349fb..5f0f35f29e7e35be5745183c4cdf09f2176d0848 100755 --- a/frameworks/innerkitsimpl/distributeddatafwk/test/unittest/app_distributed_kv_store_test.cpp +++ b/frameworks/innerkitsimpl/distributeddatafwk/test/unittest/app_distributed_kv_store_test.cpp @@ -1096,10 +1096,14 @@ HWTEST_F(AppDistributedKvStoreTest, AppKvstoreSubscribeKvStore001, TestSize.Leve }); EXPECT_NE(appKvStorePtr, nullptr); EXPECT_EQ(status, Status::SUCCESS); - ObserverImpl *observerLocal = new ObserverImpl(); + + ObserverImpl *observerLocal = new (std::nothrow) ObserverImpl(); + EXPECT_NE(observerLocal, nullptr); status = appKvStorePtr->SubscribeKvStore(localRead, subscribeType, observerLocal); EXPECT_EQ(status, Status::SUCCESS); - ObserverImpl *observerSync = new ObserverImpl(); + + ObserverImpl *observerSync = new (std::nothrow) ObserverImpl(); + EXPECT_NE(observerSync, nullptr); status = appKvStorePtr->SubscribeKvStore(syncRead, subscribeType, observerSync); EXPECT_EQ(status, Status::SUCCESS); diff --git a/frameworks/jskitsimpl/distributeddata/src/uv_queue.cpp b/frameworks/jskitsimpl/distributeddata/src/uv_queue.cpp index 8a58d08c09829f2c6dad39c831f46268889a77d5..763ca99f1fea90794e0c6d8bf0e679a5c86f4628 100644 --- a/frameworks/jskitsimpl/distributeddata/src/uv_queue.cpp +++ b/frameworks/jskitsimpl/distributeddata/src/uv_queue.cpp @@ -70,7 +70,7 @@ void UvQueue::AsyncCall(NapiCallbackGetter getter, NapiArgsGenerator genArgs) napi_value result; napi_status status = napi_call_function(entry->env, global, method, argc, argv, &result); if (status != napi_ok) { - ZLOGE("notify data change failed status:%{public}d callback:%{public}p", status, method); + ZLOGE("notify data change failed status:%{public}d.", status); } }); } diff --git a/services/distributeddataservice/adapter/account/test/account_delegate_test.cpp b/services/distributeddataservice/adapter/account/test/account_delegate_test.cpp index 0655433455b601952bb85448890db7cb5cd0440d..14cfcf89f6c86c320dd5bc26335d0b0f74607eb1 100755 --- a/services/distributeddataservice/adapter/account/test/account_delegate_test.cpp +++ b/services/distributeddataservice/adapter/account/test/account_delegate_test.cpp @@ -46,6 +46,7 @@ HWTEST_F(AccountDelegateTest, Test001, TestSize.Level0) { ZLOGD("start:"); auto account = AccountDelegate::GetInstance(); + EXPECT_NE(account, nullptr); auto observer = std::make_shared(); ZLOGD("observer:"); account->Subscribe(observer); diff --git a/services/distributeddataservice/adapter/communicator/src/process_communicator_impl.cpp b/services/distributeddataservice/adapter/communicator/src/process_communicator_impl.cpp index 8631d985f4a18f9d4a5d24f9ac176d42f5d5c6fe..e3c94be6a6e2dc4e4b0bb7be418d15175e7411b4 100755 --- a/services/distributeddataservice/adapter/communicator/src/process_communicator_impl.cpp +++ b/services/distributeddataservice/adapter/communicator/src/process_communicator_impl.cpp @@ -141,6 +141,7 @@ uint32_t ProcessCommunicatorImpl::GetMtuSize(const DeviceInfos &devInfo) } return MTU_SIZE; } + DeviceInfos ProcessCommunicatorImpl::GetLocalDeviceInfos() { DeviceInfos localDevInfos; diff --git a/services/distributeddataservice/adapter/dfx/src/hiview_adapter.cpp b/services/distributeddataservice/adapter/dfx/src/hiview_adapter.cpp index 39e22568eba319c518459394313c19b319a628df..606578005a8986f80810738e8b1b466bfe125e6b 100755 --- a/services/distributeddataservice/adapter/dfx/src/hiview_adapter.cpp +++ b/services/distributeddataservice/adapter/dfx/src/hiview_adapter.cpp @@ -87,6 +87,7 @@ void HiViewAdapter::ReportDbSize(const StatisticWrap &stat) OHOS::HiviewDFX::HiSysEvent::EventType::FAULT, USER_ID, userId, APP_ID, stat.val.appId, STORE_ID, stat.val.storeId, DB_SIZE, dbSize); } + void HiViewAdapter::InvokeDbSize() { std::lock_guard lock(dbMutex_); diff --git a/services/distributeddataservice/adapter/permission/src/client_permission_validator.cpp b/services/distributeddataservice/adapter/permission/src/client_permission_validator.cpp index 6781b1b16458261fc9bb40bdf69c404cf3b735d1..7707f3c25d5051920be3d0774e8baa1003930ae1 100755 --- a/services/distributeddataservice/adapter/permission/src/client_permission_validator.cpp +++ b/services/distributeddataservice/adapter/permission/src/client_permission_validator.cpp @@ -34,7 +34,7 @@ std::int32_t ClientPermissionChangedCallback::GetPid() void ClientPermissionChangedCallback::OnChanged(const int32_t uid) { - + (void) uid; } void ClientPermissionValidator::UpdatePermissionStatus( @@ -48,6 +48,7 @@ void ClientPermissionValidator::UpdatePermissionStatus( bool ClientPermissionValidator::CheckClientSyncPermission(const KvStoreTuple &kvStoreTuple, std::int32_t curUid) { + (void) curUid; return true; } @@ -59,7 +60,7 @@ bool ClientPermissionValidator::RegisterPermissionChanged( void ClientPermissionValidator::UnregisterPermissionChanged(const KvStoreTuple &kvStoreTuple) { - + (void) kvStoreTuple; } // after the BMS service restarted, rebuild BundleManager object and re-register permission callbacks for all apps. diff --git a/services/distributeddataservice/app/test/unittest/ut_kvstore_nb_delegate_impl.cpp b/services/distributeddataservice/app/test/unittest/ut_kvstore_nb_delegate_impl.cpp index 745e24f351b4e39f1f8345b40c5ef851d4c527f3..0edc2717c7a671badc6d6e74158d55c89569e5e2 100755 --- a/services/distributeddataservice/app/test/unittest/ut_kvstore_nb_delegate_impl.cpp +++ b/services/distributeddataservice/app/test/unittest/ut_kvstore_nb_delegate_impl.cpp @@ -106,6 +106,7 @@ DBStatus UtKvStoreNbDelegateImpl::DoPut(const Key &key, const DbValue &dbValue) DBStatus UtKvStoreNbDelegateImpl::PutBatch(const std::vector &entries) { + (void) entries; return NOT_SUPPORT; } @@ -163,6 +164,7 @@ DBStatus UtKvStoreNbDelegateImpl::GetLocal(const Key &key, Value &value) const DBStatus UtKvStoreNbDelegateImpl::PutLocal(const Key &key, const Value &value) { + (void) key; return OK; } diff --git a/services/distributeddataservice/service/directory/src/directory_manager.cpp b/services/distributeddataservice/service/directory/src/directory_manager.cpp index f4e8f331c7c9cbe91b9743b18bc986ddd81577ef..63dd79fc7275219e67c58ab3b36a2e67f2a0312a 100644 --- a/services/distributeddataservice/service/directory/src/directory_manager.cpp +++ b/services/distributeddataservice/service/directory/src/directory_manager.cpp @@ -94,6 +94,7 @@ std::string ClientDirWorker::GetSecretKeyDir(ClientContext clientContext, PathTy std::string DirectoryManager::CreatePath(const ClientContext &context, PathType type) { + (void) type; return ""; } diff --git a/services/distributeddataservice/service/rdb/rdb_service_stub.cpp b/services/distributeddataservice/service/rdb/rdb_service_stub.cpp index 1de876eea2a766e101fa9c865485c31c5b2101c9..6124fec646982361c54fa7d120056b5e47c9d548 100644 --- a/services/distributeddataservice/service/rdb/rdb_service_stub.cpp +++ b/services/distributeddataservice/service/rdb/rdb_service_stub.cpp @@ -180,7 +180,7 @@ bool RdbServiceStub::CheckInterfaceToken(MessageParcel& data) int RdbServiceStub::OnRemoteRequest(uint32_t code, MessageParcel& data, MessageParcel& reply, MessageOption& option) { - ZLOGI("code=%{public}d", code); + ZLOGI("code=%{public}u", code); if (!CheckInterfaceToken(data)) { return RDB_ERROR; }