From 62e7675b3afd5c6fcf34677a7037d0916aa990bd Mon Sep 17 00:00:00 2001 From: BrainL Date: Mon, 27 Jan 2025 17:42:04 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=88=86=E5=B8=83=E5=BC=8F=E6=96=87?= =?UTF-8?q?=E4=BB=B6idl=E5=8C=96=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: BrainL Change-Id: Ia9d07432cfa66a6c54de98db58f7e888832efbb2 --- interfaces/kits/js/src/mod_fs/properties/connectdfs.cpp | 5 +++-- interfaces/kits/js/src/mod_fs/properties/connectdfs.h | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/interfaces/kits/js/src/mod_fs/properties/connectdfs.cpp b/interfaces/kits/js/src/mod_fs/properties/connectdfs.cpp index c3dc7fd..aad8f32 100644 --- a/interfaces/kits/js/src/mod_fs/properties/connectdfs.cpp +++ b/interfaces/kits/js/src/mod_fs/properties/connectdfs.cpp @@ -283,14 +283,14 @@ void UvWorkAfterOnStaus(ConnectDfsCB *connectDfsCB) HILOGI("UvWorkAfterOnStaus end"); } -void NAPIDfsListener::OnStatus(const std::string &networkId, int32_t status) +int32_t NAPIDfsListener::OnStatus(const std::string &networkId, int32_t status) { HILOGI("NAPIDfsListener::OnStatus called"); auto connectDfsCB = new (std::nothrow) ConnectDfsCB; if (connectDfsCB == nullptr) { HILOGE("NAPIDfsListener::OnStatus, connectDfsCb == nullptr"); - return; + return E_PARAMS; } connectDfsCB->cbBase.cbInfo.env = env_; if (onStatusRef_ != nullptr) { @@ -310,6 +310,7 @@ void NAPIDfsListener::OnStatus(const std::string &networkId, int32_t status) connectDfsCB = nullptr; } HILOGI("NAPIDfsListener::OnStatus end"); + return ERRNO_NOERR; } } // namespace ModuleFileIO diff --git a/interfaces/kits/js/src/mod_fs/properties/connectdfs.h b/interfaces/kits/js/src/mod_fs/properties/connectdfs.h index 42438ad..9f662d5 100644 --- a/interfaces/kits/js/src/mod_fs/properties/connectdfs.h +++ b/interfaces/kits/js/src/mod_fs/properties/connectdfs.h @@ -37,6 +37,7 @@ using namespace OHOS::AppExecFwk; napi_value WrapInt32(napi_env &env, int32_t num, const std::string ¶mName); napi_value WrapString(napi_env &env, const std::string ¶m, const std::string ¶mName); +using namespace OHOS::Storage::DistributedFile; struct CallbackInfo { napi_env env; @@ -57,7 +58,7 @@ struct DfsConnectCB { class NAPIDfsListener : public FileDfsListenerStub { public: - void OnStatus(const std::string &networkId, int32_t status) override; + int32_t OnStatus(const std::string &networkId, int32_t status) override; void SetConnectDfsEnv(const napi_env &env); void SetConnectDfsCBRef(const napi_ref &ref); void SetConnectDfsPromiseRef(const napi_deferred &promiseDeferred); -- Gitee From 6dba5c8dbcd98dff99d0bcd589d0cdb9b7cfc005 Mon Sep 17 00:00:00 2001 From: BrainL Date: Sat, 1 Feb 2025 14:37:31 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=88=86=E5=B8=83=E5=BC=8F=E6=96=87?= =?UTF-8?q?=E4=BB=B6idl=E5=8C=96=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: BrainL Change-Id: I216bfe5eacd86b7d7c658d1a16e111fbbdaaccea --- interfaces/kits/js/src/mod_fs/properties/connectdfs.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/interfaces/kits/js/src/mod_fs/properties/connectdfs.cpp b/interfaces/kits/js/src/mod_fs/properties/connectdfs.cpp index aad8f32..86793de 100644 --- a/interfaces/kits/js/src/mod_fs/properties/connectdfs.cpp +++ b/interfaces/kits/js/src/mod_fs/properties/connectdfs.cpp @@ -32,6 +32,8 @@ namespace OHOS { namespace FileManagement { namespace ModuleFileIO { namespace fs = std::filesystem; +const int ERR_NOEER = 1; +const int ERR_NULLPTR = -1; ConnectDfsCB *ConnectDfs::CreateConnectDfsCBCBInfo(napi_env &env) { @@ -290,7 +292,7 @@ int32_t NAPIDfsListener::OnStatus(const std::string &networkId, int32_t status) auto connectDfsCB = new (std::nothrow) ConnectDfsCB; if (connectDfsCB == nullptr) { HILOGE("NAPIDfsListener::OnStatus, connectDfsCb == nullptr"); - return E_PARAMS; + return ERR_NULLPTR; } connectDfsCB->cbBase.cbInfo.env = env_; if (onStatusRef_ != nullptr) { @@ -310,7 +312,7 @@ int32_t NAPIDfsListener::OnStatus(const std::string &networkId, int32_t status) connectDfsCB = nullptr; } HILOGI("NAPIDfsListener::OnStatus end"); - return ERRNO_NOERR; + return ERR_NOEER; } } // namespace ModuleFileIO -- Gitee From fd38c12c41e102b3f8b42f397b69344381336190 Mon Sep 17 00:00:00 2001 From: BrainL Date: Sat, 1 Feb 2025 15:10:48 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=88=86=E5=B8=83=E5=BC=8F=E6=96=87?= =?UTF-8?q?=E4=BB=B6idl=E5=8C=96=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: BrainL Change-Id: I78363c08a2fd587857912cb43f0728046a7e6959 --- interfaces/kits/js/src/mod_fs/properties/connectdfs.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interfaces/kits/js/src/mod_fs/properties/connectdfs.cpp b/interfaces/kits/js/src/mod_fs/properties/connectdfs.cpp index 86793de..4403dee 100644 --- a/interfaces/kits/js/src/mod_fs/properties/connectdfs.cpp +++ b/interfaces/kits/js/src/mod_fs/properties/connectdfs.cpp @@ -32,7 +32,7 @@ namespace OHOS { namespace FileManagement { namespace ModuleFileIO { namespace fs = std::filesystem; -const int ERR_NOEER = 1; +const int ERR_NOEER = 0; const int ERR_NULLPTR = -1; ConnectDfsCB *ConnectDfs::CreateConnectDfsCBCBInfo(napi_env &env) -- Gitee