From 527835afce13f6f3c8e9bc1694df51255467e960 Mon Sep 17 00:00:00 2001
From: tianp <tianpeng35@huawei.com>
Date: Mon, 4 Aug 2025 15:38:26 +0800
Subject: [PATCH] =?UTF-8?q?copydir=E6=8E=A5=E5=8F=A3=E6=95=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: tianp <tianpeng35@huawei.com>
Change-Id: Ied4a19d51732ece9ac988aa4ed0b2f50c9b48d15
---
 .../js/src/mod_fs/properties/ani/copy_dir_ani.cpp  | 14 +++++++-------
 .../js/src/mod_fs/properties/copy_dir_core.cpp     |  8 ++++----
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/interfaces/kits/js/src/mod_fs/properties/ani/copy_dir_ani.cpp b/interfaces/kits/js/src/mod_fs/properties/ani/copy_dir_ani.cpp
index 13804c8ad..14178bb2b 100644
--- a/interfaces/kits/js/src/mod_fs/properties/ani/copy_dir_ani.cpp
+++ b/interfaces/kits/js/src/mod_fs/properties/ani/copy_dir_ani.cpp
@@ -36,7 +36,7 @@ static tuple<bool, ani_object> ToConflictFiles(ani_env *env, const ConflictFiles
     ani_class cls;
     ani_status ret;
     if ((ret = env->FindClass(classDesc, &cls)) != ANI_OK) {
-        HILOGE("Cannot find class %{private}s, err: %{private}d", classDesc, ret);
+        HILOGE("Cannot find class %{public}s, err: %{public}d", classDesc, ret);
         return { false, nullptr };
     }
 
@@ -44,7 +44,7 @@ static tuple<bool, ani_object> ToConflictFiles(ani_env *env, const ConflictFiles
     auto ctorSig = FS::ConflictFilesInner::ctorSig.c_str();
     ani_method ctor;
     if ((ret = env->Class_FindMethod(cls, ctorDesc, ctorSig, &ctor)) != ANI_OK) {
-        HILOGE("Cannot find class %{private}s constructor method, err: %{private}d", classDesc, ret);
+        HILOGE("Cannot find class %{public}s constructor method, err: %{public}d", classDesc, ret);
         return { false, nullptr };
     }
 
@@ -62,7 +62,7 @@ static tuple<bool, ani_object> ToConflictFiles(ani_env *env, const ConflictFiles
 
     ani_object obj;
     if ((ret = env->Object_New(cls, ctor, &obj, src, dest)) != ANI_OK) {
-        HILOGE("Create ConflictFiles object failed!, err: %{private}d", ret);
+        HILOGE("Create ConflictFiles object failed!, err: %{public}d", ret);
         return { false, nullptr };
     }
 
@@ -80,7 +80,7 @@ static tuple<bool, optional<ani_object>> ToConflictFilesArray(
     ani_status ret;
 
     if ((ret = env->FindClass(classDesc, &cls)) != ANI_OK) {
-        HILOGE("Cannot find class %{private}s, err: %{private}d", classDesc, ret);
+        HILOGE("Cannot find class %{public}s, err: %{public}d", classDesc, ret);
         return { false, nullopt };
     }
 
@@ -88,14 +88,14 @@ static tuple<bool, optional<ani_object>> ToConflictFilesArray(
     auto ctorSig = BuiltInTypes::Array::ctorSig.c_str();
     ani_method ctor;
     if ((ret = env->Class_FindMethod(cls, ctorDesc, ctorSig, &ctor)) != ANI_OK) {
-        HILOGE("Cannot find class %{private}s constructor method, err: %{private}d", classDesc, ret);
+        HILOGE("Cannot find class %{public}s constructor method, err: %{public}d", classDesc, ret);
         return { false, nullopt };
     }
 
     ani_object arr;
     auto files = errFiles.value();
     if ((ret = env->Object_New(cls, ctor, &arr, files.size())) != ANI_OK) {
-        HILOGE("Create Array failed!, err: %{private}d", ret);
+        HILOGE("Create Array failed!, err: %{public}d", ret);
         return { false, nullopt };
     }
 
@@ -109,7 +109,7 @@ static tuple<bool, optional<ani_object>> ToConflictFilesArray(
         }
 
         if ((ret = env->Object_CallMethodByName_Void(arr, setterDesc, setterSig, index, fileObj)) != ANI_OK) {
-            HILOGE("Add element to Array failed, err: %{private}d", ret);
+            HILOGE("Add element to Array failed, err: %{public}d", ret);
             return { false, nullopt };
         }
         index++;
diff --git a/interfaces/kits/js/src/mod_fs/properties/copy_dir_core.cpp b/interfaces/kits/js/src/mod_fs/properties/copy_dir_core.cpp
index 059fc0e6f..dd665c76f 100644
--- a/interfaces/kits/js/src/mod_fs/properties/copy_dir_core.cpp
+++ b/interfaces/kits/js/src/mod_fs/properties/copy_dir_core.cpp
@@ -132,7 +132,7 @@ static int CopyFile(const string &src, const string &dest, const int mode)
         }
     }
     if (errCode.value() != ERRNO_NOERR) {
-        HILOGE("fs exists fail, errcode is %{public}d", errCode.value());
+        HILOGE("Fs exists fail, errcode is %{public}d", errCode.value());
         return errCode.value();
     }
     filesystem::path srcPath(src);
@@ -154,7 +154,7 @@ static int CopySubDir(
             return res;
         }
     } else if (errCode.value() != ERRNO_NOERR) {
-        HILOGE("fs exists fail, errcode is %{public}d", errCode.value());
+        HILOGE("Fs exists fail, errcode is %{public}d", errCode.value());
         return errCode.value();
     }
     return RecurCopyDir(srcPath, destPath, mode, errfiles);
@@ -178,7 +178,7 @@ static int RecurCopyDir(
     }
     int num = scandir(srcPath.c_str(), &(pNameList->namelist), FilterFunc, alphasort);
     if (num < 0) {
-        HILOGE("scandir fail errno is %{public}d", errno);
+        HILOGE("Scandir fail errno is %{public}d", errno);
         return errno;
     }
     pNameList->direntNum = num;
@@ -226,7 +226,7 @@ static int CopyDirFunc(const string &src, const string &dest, const int mode, ve
             return res;
         }
     } else if (errCode.value() != ERRNO_NOERR) {
-        HILOGE("fs exists fail, errcode is %{public}d", errCode.value());
+        HILOGE("Fs exists fail, errcode is %{public}d", errCode.value());
         return errCode.value();
     }
     int res = RecurCopyDir(src, destStr, mode, errfiles);
-- 
Gitee