diff --git a/tests/unittests/backup_api/backup_impl/service_proxy_test.cpp b/tests/unittests/backup_api/backup_impl/service_proxy_test.cpp index 72f7167a731ed7fc1a7ea3a15cdcb1bfd7ba40d2..9fa622061e1e641bc593a6267c48974c750fe63f 100644 --- a/tests/unittests/backup_api/backup_impl/service_proxy_test.cpp +++ b/tests/unittests/backup_api/backup_impl/service_proxy_test.cpp @@ -595,8 +595,6 @@ HWTEST_F(ServiceProxyTest, SUB_Service_proxy_OnLoadSystemAbilitySuccess_0101, te sptr loadCallback = new ServiceProxy::ServiceProxyLoadCallback(); EXPECT_NE(loadCallback, nullptr); int32_t systemAbilityId = 0; - // const OHOS::sptr &remoteObject = make_shared(); - // shared_ptr remoteObject = make_shared(); sptr remoteObject = new MockIRemoteObject(); loadCallback->OnLoadSystemAbilitySuccess(systemAbilityId, remoteObject); loadCallback = nullptr; diff --git a/utils/src/b_filesystem/b_dir.cpp b/utils/src/b_filesystem/b_dir.cpp index 3f02020cd43bd93a6b9bd850f3d243cc5a287fa5..3a85735d76b50c2dc1a4e3b6efc7c20d90aec5b7 100644 --- a/utils/src/b_filesystem/b_dir.cpp +++ b/utils/src/b_filesystem/b_dir.cpp @@ -165,7 +165,8 @@ static set ExpandPathWildcard(const vector &vec, bool onlyPath) } } - set expandPath, filteredPath; + set expandPath; + set filteredPath; for (size_t i = 0; i < gl->gl_pathc; ++i) { expandPath.emplace(gl->gl_pathv[i]); } diff --git a/utils/src/b_process/b_process.cpp b/utils/src/b_process/b_process.cpp index 78b9226a2fb02fdb82fbf183ed6f09bdee4d23f1..97ee0a84401acaf44d9a4f76713686e0ec132127 100644 --- a/utils/src/b_process/b_process.cpp +++ b/utils/src/b_process/b_process.cpp @@ -40,14 +40,14 @@ static tuple WaitForChild(pid_t pid, unique_ptr> pipeStream, function DetectFatalLog) { - const int BUF_LEN = 1024; - auto buf = make_unique(BUF_LEN); + const int BUF_LEN = 1024; + auto buf = make_unique(BUF_LEN ); int status = 0; do { regex reg("^\\W*$"); - while ((void)memset_s(buf.get(), BUF_LEN, 0, BUF_LEN), - fgets(buf.get(), BUF_LEN - 1, pipeStream.get()) != nullptr) { + while ((void)memset_s(buf.get(), BUF_LEN , 0, BUF_LEN ), + fgets(buf.get(), BUF_LEN - 1, pipeStream.get()) != nullptr) { if (regex_match(buf.get(), reg)) { continue; }