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 c95ceeebb5825d85a0f800cde43d98e7955017fa..a9daa19972c6aacaa562f13edff28c1a98e8aa09 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(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(env, objFileIteratorExporter); - if (fileIteratorEntity == nullptr) { - return ThrowError(env, E_GETRESULT); - } + if (fileIteratorEntity == nullptr) return ThrowError(env, E_GETRESULT); { std::lock_guard 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 7c1f257b4254125956372624cc04d2339312d0af..27cce12a2ab94d76fe7a90d3e9d20c69b30a4ca9 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(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(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;