diff --git a/LICENSE b/LICENSE index 4947287..2bb9ad2 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,3 @@ - Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ diff --git a/interfaces/kits/js/src/common/napi/n_async/n_async_work_callback.cpp b/interfaces/kits/js/src/common/napi/n_async/n_async_work_callback.cpp index 6b6d0b7..e514418 100644 --- a/interfaces/kits/js/src/common/napi/n_async/n_async_work_callback.cpp +++ b/interfaces/kits/js/src/common/napi/n_async/n_async_work_callback.cpp @@ -91,7 +91,7 @@ NVal NAsyncWorkCallback::Schedule(string procedureName, NContextCBExec cbExec, N return NVal(); } - ctx_ = nullptr; // The ownership of ctx_ has been transfered + ctx_ = nullptr; // The ownership of ctx_ has been transferred return NVal::CreateUndefined(env_); } } // namespace DistributedFS diff --git a/interfaces/kits/js/src/common/napi/n_class.cpp b/interfaces/kits/js/src/common/napi/n_class.cpp index c5a77b2..7a6a357 100644 --- a/interfaces/kits/js/src/common/napi/n_class.cpp +++ b/interfaces/kits/js/src/common/napi/n_class.cpp @@ -69,7 +69,7 @@ bool NClass::SaveClass(napi_env env, string className, napi_value exClass) return res == napi_ok; } -napi_value NClass::InstantiateClass(napi_env env, string className, vector args) +napi_value NClass::InstantiateClass(napi_env env, string& className, vector& args) { NClass &nClass = NClass::GetInstance(); lock_guard(nClass.exClassMapLock); diff --git a/interfaces/kits/js/src/common/napi/n_class.h b/interfaces/kits/js/src/common/napi/n_class.h index 3f1abd0..fc0e23b 100644 --- a/interfaces/kits/js/src/common/napi/n_class.h +++ b/interfaces/kits/js/src/common/napi/n_class.h @@ -35,7 +35,7 @@ public: napi_callback constructor, std::vector &&properties); static bool SaveClass(napi_env env, std::string className, napi_value exClass); - static napi_value InstantiateClass(napi_env env, std::string className, std::vector args); + static napi_value InstantiateClass(napi_env env, std::string& className, std::vector& args); template static T *GetEntityOf(napi_env env, napi_value objStat) { diff --git a/interfaces/kits/js/src/mod_file/class_file/file_n_exporter.cpp b/interfaces/kits/js/src/mod_file/class_file/file_n_exporter.cpp index 449a93e..df8764e 100644 --- a/interfaces/kits/js/src/mod_file/class_file/file_n_exporter.cpp +++ b/interfaces/kits/js/src/mod_file/class_file/file_n_exporter.cpp @@ -188,7 +188,9 @@ bool GetFileNames(string path, vector &filenames, bool rec, bool isList) if (isList) { filenames.push_back(path + "/" + ptr->d_name); } else if (ptr->d_type == DT_DIR && rec) { - GetFileNames(path + "/" + ptr->d_name, filenames, rec, isList); + if(GetFileNames(path + "/" + ptr->d_name, filenames, rec, isList) == false) { + break; + } } else if (ptr->d_type == DT_REG) { filenames.push_back(path + "/" + ptr->d_name); } diff --git a/utils/filemgmt_libn/src/n_async/n_async_work_callback.cpp b/utils/filemgmt_libn/src/n_async/n_async_work_callback.cpp index 1afb0f0..d7a6793 100644 --- a/utils/filemgmt_libn/src/n_async/n_async_work_callback.cpp +++ b/utils/filemgmt_libn/src/n_async/n_async_work_callback.cpp @@ -92,7 +92,7 @@ NVal NAsyncWorkCallback::Schedule(string procedureName, NContextCBExec cbExec, N return NVal(); } - ctx_ = nullptr; // The ownership of ctx_ has been transfered + ctx_ = nullptr; // The ownership of ctx_ has been transferred return NVal::CreateUndefined(env_); } } // namespace LibN diff --git a/utils/filemgmt_libn/src/n_async/n_async_work_promise.cpp b/utils/filemgmt_libn/src/n_async/n_async_work_promise.cpp index 3ce1a74..443c450 100644 --- a/utils/filemgmt_libn/src/n_async/n_async_work_promise.cpp +++ b/utils/filemgmt_libn/src/n_async/n_async_work_promise.cpp @@ -85,7 +85,7 @@ NVal NAsyncWorkPromise::Schedule(string procedureName, NContextCBExec cbExec, NC return NVal(); } - ctx_ = nullptr; // The ownership of ctx_ has been transfered + ctx_ = nullptr; // The ownership of ctx_ has been transferred return {env_, result}; } } // namespace LibN