From 589e580558b96d27912d25759843eb0d86e28f20 Mon Sep 17 00:00:00 2001
From: zhaoyongjin1 <zhaoyongjin1@huawei.com>
Date: Wed, 24 Jan 2024 10:45:52 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B6=85=E5=A4=A7=E5=87=BD=E6=95=B0=E5=A4=84?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zhaoyongjin1 <zhaoyongjin1@huawei.com>
---
 .../file_info/napi_file_info_exporter.cpp     | 20 +++++--------------
 .../root_info/napi_root_info_exporter.cpp     | 20 +++++--------------
 2 files changed, 10 insertions(+), 30 deletions(-)

diff --git a/frameworks/js/napi/file_access_module/file_info/napi_file_info_exporter.cpp b/frameworks/js/napi/file_access_module/file_info/napi_file_info_exporter.cpp
index c95ceeeb..a9daa199 100644
--- a/frameworks/js/napi/file_access_module/file_info/napi_file_info_exporter.cpp
+++ b/frameworks/js/napi/file_access_module/file_info/napi_file_info_exporter.cpp
@@ -88,20 +88,14 @@ napi_value NapiFileInfoExporter::ThrowError(napi_env env, int code)
 napi_value NapiFileInfoExporter::ListFile(napi_env env, napi_callback_info info)
 {
     NFuncArg funcArg(env, info);
-    if (!funcArg.InitArgs(NARG_CNT::ZERO, NARG_CNT::ONE)) {
-        return ThrowError(env, EINVAL);
-    }
+    if (!funcArg.InitArgs(NARG_CNT::ZERO, NARG_CNT::ONE)) return ThrowError(env, EINVAL);
     FileFilter filter({}, {}, {}, FileFilter::INVALID_SIZE, FileFilter::INVALID_MODIFY_AFTER, false, false);
     if (funcArg.GetArgc() == NARG_CNT::ONE) {
         auto ret = GetFileFilterParam(NVal(env, funcArg.GetArg(NARG_POS::FIRST)), filter);
-        if (ret != ERR_OK) {
-            return ThrowError(env, ret);
-        }
+        if (ret != ERR_OK) return ThrowError(env, ret);
     }
     auto fileInfoEntity = NClass::GetEntityOf<FileInfoEntity>(env, funcArg.GetThisVar());
-    if (fileInfoEntity == nullptr) {
-        return ThrowError(env, E_GETRESULT);
-    }
+    if (fileInfoEntity == nullptr) return ThrowError(env, E_GETRESULT);
     if (IsDirectory(fileInfoEntity->fileInfo.mode) != ERR_OK) {
         HILOG_ERROR("current FileInfo's mode error");
         return NVal::CreateUndefined(env).val_;
@@ -110,13 +104,9 @@ napi_value NapiFileInfoExporter::ListFile(napi_env env, napi_callback_info info)
         return ThrowError(env, E_GETRESULT);
     }
     auto objFileIteratorExporter = NClass::InstantiateClass(env, NapiFileIteratorExporter::className_, {});
-    if (objFileIteratorExporter == nullptr) {
-        return ThrowError(env, E_GETRESULT);
-    }
+    if (objFileIteratorExporter == nullptr) return ThrowError(env, E_GETRESULT);
     auto fileIteratorEntity = NClass::GetEntityOf<FileIteratorEntity>(env, objFileIteratorExporter);
-    if (fileIteratorEntity == nullptr) {
-        return ThrowError(env, E_GETRESULT);
-    }
+    if (fileIteratorEntity == nullptr) return ThrowError(env, E_GETRESULT);
     {
         std::lock_guard<std::mutex> lock(fileIteratorEntity->entityOperateMutex);
         int ret = FileAccessFwk::SharedMemoryOperation::CreateSharedMemory("FileInfoList", DEFAULT_CAPACITY_200KB,
diff --git a/frameworks/js/napi/file_access_module/root_info/napi_root_info_exporter.cpp b/frameworks/js/napi/file_access_module/root_info/napi_root_info_exporter.cpp
index 7c1f257b..27cce12a 100644
--- a/frameworks/js/napi/file_access_module/root_info/napi_root_info_exporter.cpp
+++ b/frameworks/js/napi/file_access_module/root_info/napi_root_info_exporter.cpp
@@ -91,25 +91,15 @@ napi_value NapiRootInfoExporter::ListFile(napi_env env, napi_callback_info info)
     FileFilter filter({}, {}, {}, FileFilter::INVALID_SIZE, FileFilter::INVALID_MODIFY_AFTER, false, false);
     if (funcArg.GetArgc() == NARG_CNT::ONE) {
         auto ret = GetFileFilterParam(NVal(env, funcArg.GetArg(NARG_POS::FIRST)), filter);
-        if (ret != ERR_OK) {
-            return NapiFileInfoExporter::ThrowError(env, ret);
-        }
+        if (ret != ERR_OK) return NapiFileInfoExporter::ThrowError(env, ret);
     }
     auto rootEntity = NClass::GetEntityOf<RootInfoEntity>(env, funcArg.GetThisVar());
-    if (rootEntity == nullptr) {
-        return NapiFileInfoExporter::ThrowError(env, E_GETRESULT);
-    }
-    if (rootEntity->fileAccessHelper == nullptr) {
-        return NapiFileInfoExporter::ThrowError(env, E_GETRESULT);
-    }
+    if (rootEntity == nullptr) return NapiFileInfoExporter::ThrowError(env, E_GETRESULT);
+    if (rootEntity->fileAccessHelper == nullptr) return NapiFileInfoExporter::ThrowError(env, E_GETRESULT);
     napi_value objFileIteratorExporter = NClass::InstantiateClass(env, NapiFileIteratorExporter::className_, {});
-    if (objFileIteratorExporter == nullptr) {
-        return NapiFileInfoExporter::ThrowError(env, E_GETRESULT);
-    }
+    if (objFileIteratorExporter == nullptr) return NapiFileInfoExporter::ThrowError(env, E_GETRESULT);
     auto fileIteratorEntity = NClass::GetEntityOf<FileIteratorEntity>(env, objFileIteratorExporter);
-    if (fileIteratorEntity == nullptr) {
-        return NapiFileInfoExporter::ThrowError(env, E_GETRESULT);
-    }
+    if (fileIteratorEntity == nullptr) return NapiFileInfoExporter::ThrowError(env, E_GETRESULT);
     FileInfo fileInfo;
     fileInfo.uri = rootEntity->rootInfo.uri;
     fileInfo.mode = DOCUMENT_FLAG_REPRESENTS_DIR | DOCUMENT_FLAG_SUPPORTS_READ | DOCUMENT_FLAG_SUPPORTS_WRITE;
-- 
Gitee