diff --git a/interfaces/kits/js/src/common/fs_file_filter.h b/interfaces/kits/js/src/common/fs_file_filter.h index f16c178213255dd738a7c62d64419e0d7adf6271..00fcff4d88d765bb4027ac6c5addb84672e13339 100644 --- a/interfaces/kits/js/src/common/fs_file_filter.h +++ b/interfaces/kits/js/src/common/fs_file_filter.h @@ -71,7 +71,7 @@ public: return fileSizeOver_; } - void SetLastModifiedAfter(const std::optional &lastModifiedAfter) + void SetLastModifiedAfter(const std::optional &lastModifiedAfter) { lastModifiedAfter_ = std::move(lastModifiedAfter); } 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 ae59411014fc32a4910040b9e6aa1ee79f2adf25..3ed6715ac3c17fe8b3efdb3d7632c7d76b6efc80 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 @@ -56,7 +56,7 @@ static tuple ToConflictFiles(ani_env *env, const ConflictFiles } auto [succDest, dest] = TypeConverter::ToAniString(env, files.destFiles); - if (!succSrc) { + if (!succDest) { HILOGE("Convert ConflictFiles destFiles to ani string failed!"); return { false, nullptr }; } @@ -122,18 +122,16 @@ static tuple> ToConflictFilesArray( void CopyDirAni::CopyDirSync( ani_env *env, [[maybe_unused]] ani_class clazz, ani_string src, ani_string dest, ani_object mode) { - error_code errCode; - auto [succSrc, srcPath] = TypeConverter::ToUTF8String(env, src); if (!succSrc) { - HILOGE("Invalid src, errCode = %{public}d", errCode.value()); + HILOGE("Invalid src"); ErrorHandler::Throw(env, EINVAL); return; } auto [succDest, destPath] = TypeConverter::ToUTF8String(env, dest); if (!succDest) { - HILOGE("Invalid dest, errCode = %{public}d", errCode.value()); + HILOGE("Invalid dest"); ErrorHandler::Throw(env, EINVAL); return; } diff --git a/interfaces/kits/js/src/mod_fs/properties/ani/mkdtemp_ani.cpp b/interfaces/kits/js/src/mod_fs/properties/ani/mkdtemp_ani.cpp index 42b5a73167eca8dcf6782f61016dea3d1ee24f26..915f0574dddb241714011bf784e5fa7474bf3402 100644 --- a/interfaces/kits/js/src/mod_fs/properties/ani/mkdtemp_ani.cpp +++ b/interfaces/kits/js/src/mod_fs/properties/ani/mkdtemp_ani.cpp @@ -38,7 +38,7 @@ ani_string MkdtempAni::MkdtempSync(ani_env *env, [[maybe_unused]] ani_class claz auto ret = MkdtempCore::DoMkdtemp(prefixPath); if (!ret.IsSuccess()) { - HILOGE("Mkdtemp faild"); + HILOGE("Mkdtemp failed"); const auto &err = ret.GetError(); ErrorHandler::Throw(env, err); return nullptr; diff --git a/interfaces/kits/js/src/mod_fs/properties/ani/movedir_ani.cpp b/interfaces/kits/js/src/mod_fs/properties/ani/movedir_ani.cpp index e571ae53aeec1fc58b00de8fd16eec429fc7af89..b832a5a4909c0f7eae8a9a81785f5ef6ae752d62 100644 --- a/interfaces/kits/js/src/mod_fs/properties/ani/movedir_ani.cpp +++ b/interfaces/kits/js/src/mod_fs/properties/ani/movedir_ani.cpp @@ -54,7 +54,7 @@ static tuple ToConflictFiles(ani_env *env, const ErrFiles &fil } auto [succDest, dest] = TypeConverter::ToAniString(env, files.destFiles); - if (!succSrc) { + if (!succDest) { HILOGE("Convert ConflictFiles destFiles to ani string failed!"); return { false, nullptr }; } diff --git a/interfaces/kits/js/src/mod_fs/properties/dup_core.cpp b/interfaces/kits/js/src/mod_fs/properties/dup_core.cpp index b70fac876f30d86f08c36aaffbe3d81d628c481f..b4e5b0cbd1cc245ce0bd2c9391aa530d2a59e271 100644 --- a/interfaces/kits/js/src/mod_fs/properties/dup_core.cpp +++ b/interfaces/kits/js/src/mod_fs/properties/dup_core.cpp @@ -58,7 +58,7 @@ FsResult DupCore::DoDup(const int32_t &fd) } string path = "/proc/self/fd/" + to_string(dstFd); int ret = uv_fs_readlink(nullptr, readLinkReq.get(), path.c_str(), nullptr); - if (ret < 0) { + if (ret < 0 || readLinkReq->ptr == nullptr) { HILOGE("Failed to readlink fd, ret: %{public}d", ret); close(dstFd); return FsResult::Error(ret);