From 27aecc633907fea5a3a079406a374b6ca6a23c20 Mon Sep 17 00:00:00 2001 From: chensihan Date: Thu, 14 Nov 2024 09:21:10 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=AB=E6=8F=8F=E5=8A=A0=E5=9B=BA=20Signed-o?= =?UTF-8?q?ff-by:=20chensihan=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- services/backup_sa/src/module_ipc/service.cpp | 4 ++-- utils/src/b_filesystem/b_dir.cpp | 11 ++++++----- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/services/backup_sa/src/module_ipc/service.cpp b/services/backup_sa/src/module_ipc/service.cpp index 6d611a916..23bc9a3c7 100644 --- a/services/backup_sa/src/module_ipc/service.cpp +++ b/services/backup_sa/src/module_ipc/service.cpp @@ -860,8 +860,8 @@ void Service::HandleCurGroupBackupInfos(std::vector SetCurrentSessProperties(info, isClearDataFlags, bundleNameIndexInfo); BJsonUtil::BundleDetailInfo uniCastInfo; if (BJsonUtil::FindBundleInfoByName(bundleNameDetailMap, bundleNameIndexInfo, UNICAST_TYPE, uniCastInfo)) { - HILOGI("current bundle:%{public}s, unicast info:%{public}s", bundleNameIndexInfo.c_str(), - GetAnonyString(uniCastInfo.detail).c_str()); + HILOGI("current bundle:%{public}s, unicast info:%{public}s, unicast info size:%{public}zu", + bundleNameIndexInfo.c_str(), GetAnonyString(uniCastInfo.detail).c_str(), uniCastInfo.detail.size()); session_->SetBackupExtInfo(bundleNameIndexInfo, uniCastInfo.detail); } session_->SetBackupExtName(bundleNameIndexInfo, info.extensionName); diff --git a/utils/src/b_filesystem/b_dir.cpp b/utils/src/b_filesystem/b_dir.cpp index 9a462c098..88f5c4e6a 100644 --- a/utils/src/b_filesystem/b_dir.cpp +++ b/utils/src/b_filesystem/b_dir.cpp @@ -65,7 +65,8 @@ static tuple, map> GetFile(con map smallFiles; struct stat sta = {}; if (stat(path.data(), &sta) == -1) { - return {BError(errno).GetCode(), files, smallFiles}; + HILOGE("File not exist, errno:%{public}d, fileName:%{private}s.", errno, path.c_str()); + return {BError(BError::Codes::OK).GetCode(), files, smallFiles}; } if (path == "/") { return {BError(BError::Codes::OK).GetCode(), files, smallFiles}; @@ -268,11 +269,11 @@ tuple, map> BDir::GetBigFiles( map incFiles; map incSmallFiles; for (const auto &item : inc) { + HILOGW("GetBigFiles, path = %{public}s", item.c_str()); auto [errCode, files, smallFiles] = GetDirFilesDetail(item, true, BConstants::BIG_FILE_BOUNDARY); if (errCode == 0) { - int32_t num = static_cast(files.size()); incFiles.merge(move(files)); - HILOGI("big files: %{public}d; small files: %{public}d", num, static_cast(smallFiles.size())); + HILOGW("big files: %{public}zu; small files: %{public}zu", files.size(), smallFiles.size()); incSmallFiles.insert(smallFiles.begin(), smallFiles.end()); } } @@ -309,8 +310,8 @@ tuple, map> BDir::GetBigFiles( bigFiles[item.first] = item.second; } } - HILOGI("total number of big files is %{public}d", static_cast(bigFiles.size())); - HILOGI("total number of small files is %{public}d", static_cast(resSmallFiles.size())); + HILOGW("total number of big files is %{public}zu", bigFiles.size()); + HILOGW("total number of small files is %{public}zu", resSmallFiles.size()); return {ERR_OK, move(bigFiles), move(resSmallFiles)}; } -- Gitee