diff --git a/interfaces/kits/js/src/mod_fs/properties/connectdfs.cpp b/interfaces/kits/js/src/mod_fs/properties/connectdfs.cpp index c3dc7fdb09819cb06e7ba4c6c34a69883523b91f..6bb9bf3dc2b8af23de1d94b81fac6e708cd2fe6c 100644 --- a/interfaces/kits/js/src/mod_fs/properties/connectdfs.cpp +++ b/interfaces/kits/js/src/mod_fs/properties/connectdfs.cpp @@ -33,6 +33,9 @@ namespace FileManagement { namespace ModuleFileIO { namespace fs = std::filesystem; +const int ERR_NOEER = 0; +const int ERR_NULLPTR = -1; + ConnectDfsCB *ConnectDfs::CreateConnectDfsCBCBInfo(napi_env &env) { HILOGI("CreateConnectDfsCBCBInfo called"); @@ -283,14 +286,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 ERR_NULLPTR; } connectDfsCB->cbBase.cbInfo.env = env_; if (onStatusRef_ != nullptr) { @@ -310,6 +313,7 @@ void NAPIDfsListener::OnStatus(const std::string &networkId, int32_t status) connectDfsCB = nullptr; } HILOGI("NAPIDfsListener::OnStatus end"); + return ERR_NOEER; } } // 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 42438ad2efc48176e81ace2bd2237c7cd72a2ff9..1a100fac78a6eaab4e05032573d6203de451e921 100644 --- a/interfaces/kits/js/src/mod_fs/properties/connectdfs.h +++ b/interfaces/kits/js/src/mod_fs/properties/connectdfs.h @@ -34,6 +34,7 @@ namespace ModuleFileIO { using namespace std; using namespace OHOS::FileManagement::LibN; using namespace OHOS::AppExecFwk; +using namespace OHOS::Storage::DistributedFile; 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); @@ -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);