From 1b29693d142619eb8442d315043a3e550b441c10 Mon Sep 17 00:00:00 2001 From: linjun9528 Date: Mon, 21 Mar 2022 17:08:09 +0800 Subject: [PATCH 1/2] [release] fix data print codex Signed-off-by: linjun9528 --- services/src/fileoper/external_storage_utils.cpp | 8 ++++---- services/src/fileoper/media_file_utils.cpp | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/services/src/fileoper/external_storage_utils.cpp b/services/src/fileoper/external_storage_utils.cpp index 20ca2545..88403985 100644 --- a/services/src/fileoper/external_storage_utils.cpp +++ b/services/src/fileoper/external_storage_utils.cpp @@ -37,11 +37,11 @@ static bool GetPathFromUri(const string &uri, string &path) uint len = EXTERNAL_STORAGE_URI.size(); string head = uri.substr(0, len); if (head != EXTERNAL_STORAGE_URI) { - ERR_LOG("invalid format uri %{public}s, head check fail", uri.c_str()); + ERR_LOG("invalid format uri %{private}s, head check fail", uri.c_str()); return false; } if (uri.size() == len) { - ERR_LOG("uri content is invalid %{public}s", uri.c_str()); + ERR_LOG("uri content is invalid %{private}s", uri.c_str()); return false; } path = uri.substr(len); @@ -116,13 +116,13 @@ int ExternalStorageUtils::DoListFile(const std::string &type, const std::string DEBUG_LOG("limit %{public}lld, offset %{public}lld", count, offset); std::string path; if (!ConvertUriToAbsolutePath(uri, path)) { - ERR_LOG("invalid uri[%{public}s].", uri.c_str()); + ERR_LOG("invalid uri[%{private}s].", uri.c_str()); return E_NOEXIST; } DIR *dir = opendir(path.c_str()); if (!dir) { - ERR_LOG("opendir path[%{public}s] fail.", path.c_str()); + ERR_LOG("opendir path[%{private}s] fail.", path.c_str()); return E_NOEXIST; } if (offset != 0) { diff --git a/services/src/fileoper/media_file_utils.cpp b/services/src/fileoper/media_file_utils.cpp index c60ec960..b08430ec 100644 --- a/services/src/fileoper/media_file_utils.cpp +++ b/services/src/fileoper/media_file_utils.cpp @@ -81,12 +81,12 @@ bool GetPathID(const string &uriPath, string &index) { string::size_type pos = uriPath.find_last_of('/'); if (pos == string::npos) { - ERR_LOG("invalid uri %{public}s", uriPath.c_str()); + ERR_LOG("invalid uri %{private}s", uriPath.c_str()); return false; } index = uriPath.substr(pos + 1); if (!IsNumber(index)) { - ERR_LOG("invalid uri %{public}s invalid id %{public}s", uriPath.c_str(), index.c_str()); + ERR_LOG("invalid uri %{private}s invalid id %{public}s", uriPath.c_str(), index.c_str()); return false; } return true; @@ -420,7 +420,7 @@ bool MediaFileUtils::InitHelper(sptr obj) if (abilityHelper == nullptr) { abilityHelper = AppExecFwk::DataAbilityHelper::Creator(obj, make_shared(Media::MEDIALIBRARY_DATA_URI)); if (abilityHelper == nullptr) { - DEBUG_LOG("get %{public}s helper fail", Media::MEDIALIBRARY_DATA_URI.c_str()); + DEBUG_LOG("get %{private}s helper fail", Media::MEDIALIBRARY_DATA_URI.c_str()); return false; } } -- Gitee From a44e9e00293f4be72f9dc8b0a5ca9ad34f28fc03 Mon Sep 17 00:00:00 2001 From: linjun9528 Date: Mon, 21 Mar 2022 18:06:27 +0800 Subject: [PATCH 2/2] [release] fix data print codex Signed-off-by: linjun9528 --- services/src/fileoper/media_file_utils.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/src/fileoper/media_file_utils.cpp b/services/src/fileoper/media_file_utils.cpp index b08430ec..36fa68bf 100644 --- a/services/src/fileoper/media_file_utils.cpp +++ b/services/src/fileoper/media_file_utils.cpp @@ -331,7 +331,7 @@ int MediaFileUtils::DoInsert(const string &name, const string &path, const strin Media::MEDIA_FILEOPRN_CREATEASSET); int index = abilityHelper->Insert(createAsset, values); if (index < 0) { - ERR_LOG("Fail to create fail file %{public}s uri %{public}s album %{public}s", name.c_str(), + ERR_LOG("Fail to create fail file %{public}s uri %{private}s album %{public}s", name.c_str(), path.c_str(), albumPath.c_str()); return E_CREATE_FAIL; } -- Gitee