From 3ca65f11264815a58a0e81309ffe7d6939736ab3 Mon Sep 17 00:00:00 2001 From: "yaoruozi1@huawei.com" Date: Thu, 24 Apr 2025 22:23:08 +0800 Subject: [PATCH] modify code review comments Signed-off-by: yaoruozi1@huawei.com --- frameworks/native/backup_ext/src/ext_extension.cpp | 2 +- frameworks/native/backup_ext/src/sub_ext_extension.cpp | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/frameworks/native/backup_ext/src/ext_extension.cpp b/frameworks/native/backup_ext/src/ext_extension.cpp index ba0764b4f..bc03911e3 100644 --- a/frameworks/native/backup_ext/src/ext_extension.cpp +++ b/frameworks/native/backup_ext/src/ext_extension.cpp @@ -329,13 +329,13 @@ tuple BackupExtExtension::GetIncreFileHandleForSpec } std::unique_lock lock(reportHashLock_); reportHashSrcPathMap_.emplace(fileName, reportFullHashName); - lock.unlock(); return { errCode, move(fd), move(reportHashFd) }; } UniqueFd reportFd(open(reportFullFileName.data(), O_RDWR | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR)); if (reportFd < 0) { HILOGE("Failed to open report file = %{public}s, err = %{public}d", GetAnonyPath(reportFullFileName).c_str(), errno); + errCode = errno; } return { errCode, move(fd), move(reportFd) }; } diff --git a/frameworks/native/backup_ext/src/sub_ext_extension.cpp b/frameworks/native/backup_ext/src/sub_ext_extension.cpp index 5f67ee933..8b9d8fea4 100644 --- a/frameworks/native/backup_ext/src/sub_ext_extension.cpp +++ b/frameworks/native/backup_ext/src/sub_ext_extension.cpp @@ -1392,6 +1392,7 @@ void BackupExtExtension::RmBigFileReportForSpecialCloneCloud(const std::string & { // 删除大文件的rp文件 string reportFileName = GetReportFileName(srcFileName); + std::unique_lock lock(reportHashLock_); if (reportHashSrcPathMap_.empty()) { if (!RemoveFile(reportFileName)) { HILOGE("Failed to delete backup report %{public}s, err = %{public}d", @@ -1399,7 +1400,6 @@ void BackupExtExtension::RmBigFileReportForSpecialCloneCloud(const std::string & } return; } - std::unique_lock lock(reportHashLock_); auto iter = reportHashSrcPathMap_.find(srcFileName); if (iter == reportHashSrcPathMap_.end()) { if (!RemoveFile(reportFileName)) { @@ -1416,6 +1416,5 @@ void BackupExtExtension::RmBigFileReportForSpecialCloneCloud(const std::string & GetAnonyPath(reportHashFilePath).c_str(), errno); } reportHashSrcPathMap_.erase(iter); - lock.unlock(); } } // namespace OHOS::FileManagement::Backup -- Gitee