From f9295f8a191ffa2e9b3ffbb6a4df09be357fd9c6 Mon Sep 17 00:00:00 2001 From: chenkai008 Date: Thu, 30 Jun 2022 20:03:10 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=94=99=E8=AF=AF=E7=A0=81?= =?UTF-8?q?=E8=BF=94=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: chenkai008 --- .../file_access/src/file_access_ext_proxy.cpp | 7 ++-- .../file_access/src/file_access_ext_stub.cpp | 29 +------------ .../src/file_access_ext_stub_impl.cpp | 42 ++++++++----------- 3 files changed, 23 insertions(+), 55 deletions(-) diff --git a/frameworks/innerkits/file_access/src/file_access_ext_proxy.cpp b/frameworks/innerkits/file_access/src/file_access_ext_proxy.cpp index 129d687d..e1bbe4c3 100644 --- a/frameworks/innerkits/file_access/src/file_access_ext_proxy.cpp +++ b/frameworks/innerkits/file_access/src/file_access_ext_proxy.cpp @@ -87,7 +87,7 @@ int FileAccessExtProxy::CreateFile(const Uri &parent, const std::string &display int ret = reply.ReadInt32(); if (ret < ERR_OK) { HILOG_ERROR("%{public}s fail to ReadInt32 ret", __func__); - return ERR_IPC_ERROR; + return ret; } std::unique_ptr tempUri(reply.ReadParcelable()); @@ -134,7 +134,7 @@ int FileAccessExtProxy::Mkdir(const Uri &parent, const std::string &displayName, int ret = reply.ReadInt32(); if (ret < ERR_OK) { HILOG_ERROR("%{public}s fail to ReadInt32 ret", __func__); - return ERR_IPC_ERROR; + return ret; } std::unique_ptr tempUri(reply.ReadParcelable()); @@ -172,7 +172,6 @@ int FileAccessExtProxy::Delete(const Uri &sourceFile) int ret = reply.ReadInt32(); if (ret < ERR_OK) { HILOG_ERROR("%{public}s fail to ReadInt32 ret", __func__); - return ERR_IPC_ERROR; } return ret; @@ -259,7 +258,7 @@ int FileAccessExtProxy::Rename(const Uri &sourceFile, const std::string &display int ret = reply.ReadInt32(); if (ret < ERR_OK) { HILOG_ERROR("%{public}s fail to ReadInt32 ret", __func__); - return ERR_IPC_ERROR; + return ret; } std::unique_ptr tempUri(reply.ReadParcelable()); diff --git a/frameworks/innerkits/file_access/src/file_access_ext_stub.cpp b/frameworks/innerkits/file_access/src/file_access_ext_stub.cpp index a7a5b8c1..7c1fa34d 100644 --- a/frameworks/innerkits/file_access/src/file_access_ext_stub.cpp +++ b/frameworks/innerkits/file_access/src/file_access_ext_stub.cpp @@ -83,7 +83,7 @@ ErrCode FileAccessExtStub::CmdOpenFile(MessageParcel &data, MessageParcel &reply HILOG_ERROR("OpenFile fail, fd is %{pubilc}d", fd); return ERR_INVALID_FD; } - + if (!reply.WriteFileDescriptor(fd)) { HILOG_ERROR("fail to WriteFileDescriptor fd"); return ERR_IPC_ERROR; @@ -112,11 +112,6 @@ ErrCode FileAccessExtStub::CmdCreateFile(MessageParcel &data, MessageParcel &rep } int ret = CreateFile(*parent, displayName, *fileNew); - if (ret < 0) { - HILOG_ERROR("CreateFile fail, ret is %{pubilc}d", ret); - return ERR_FILEIO_FAIL; - } - if (!reply.WriteInt32(ret)) { HILOG_ERROR("fail to WriteInt32 ret"); return ERR_IPC_ERROR; @@ -150,11 +145,6 @@ ErrCode FileAccessExtStub::CmdMkdir(MessageParcel &data, MessageParcel &reply) } int ret = Mkdir(*parent, displayName, *fileNew); - if (ret < 0) { - HILOG_ERROR("Mkdir fail, ret is %{pubilc}d", ret); - return ERR_FILEIO_FAIL; - } - if (!reply.WriteInt32(ret)) { HILOG_ERROR("fail to WriteInt32 ret"); return ERR_IPC_ERROR; @@ -176,13 +166,8 @@ ErrCode FileAccessExtStub::CmdDelete(MessageParcel &data, MessageParcel &reply) } int ret = Delete(*uri); - if (ret < 0) { - HILOG_ERROR("Delete fail, ret is %{pubilc}d", ret); - return ERR_FILEIO_FAIL; - } - if (!reply.WriteInt32(ret)) { - HILOG_ERROR("fail to WriteFileDescriptor ret"); + HILOG_ERROR("fail to WriteInt32 ret"); return ERR_IPC_ERROR; } return ERR_OK; @@ -209,11 +194,6 @@ ErrCode FileAccessExtStub::CmdMove(MessageParcel &data, MessageParcel &reply) } int ret = Move(*sourceFile, *targetParent, *fileNew); - if (ret < 0) { - HILOG_ERROR("Move fail, ret is %{pubilc}d", ret); - return ERR_FILEIO_FAIL; - } - if (!reply.WriteInt32(ret)) { HILOG_ERROR("fail to WriteInt32 ret"); return ERR_IPC_ERROR; @@ -247,11 +227,6 @@ ErrCode FileAccessExtStub::CmdRename(MessageParcel &data, MessageParcel &reply) } int ret = Rename(*sourceFile, displayName, *fileNew); - if (ret < 0) { - HILOG_ERROR("Rename fail, ret is %{pubilc}d", ret); - return ERR_FILEIO_FAIL; - } - if (!reply.WriteInt32(ret)) { HILOG_ERROR("fail to WriteInt32 ret"); return ERR_IPC_ERROR; diff --git a/frameworks/innerkits/file_access/src/file_access_ext_stub_impl.cpp b/frameworks/innerkits/file_access/src/file_access_ext_stub_impl.cpp index d7355fa7..5e7f52b5 100644 --- a/frameworks/innerkits/file_access/src/file_access_ext_stub_impl.cpp +++ b/frameworks/innerkits/file_access/src/file_access_ext_stub_impl.cpp @@ -27,74 +27,68 @@ std::shared_ptr FileAccessExtStubImpl::GetOwner() int FileAccessExtStubImpl::OpenFile(const Uri &uri, int flags) { - int ret = ERR_ERROR; auto extension = GetOwner(); if (extension == nullptr) { HILOG_ERROR("get extension failed."); - return ret; + return ERR_ERROR; } - ret = extension->OpenFile(uri, flags); - return ret; + + return extension->OpenFile(uri, flags); } int FileAccessExtStubImpl::CreateFile(const Uri &parent, const std::string &displayName, Uri &newFile) { - int ret = ERR_ERROR; auto extension = GetOwner(); if (extension == nullptr) { HILOG_ERROR("get extension failed."); - return ret; + return ERR_ERROR; } - ret = extension->CreateFile(parent, displayName, newFile); - return ret; + + return extension->CreateFile(parent, displayName, newFile); } int FileAccessExtStubImpl::Mkdir(const Uri &parent, const std::string &displayName, Uri &newFile) { - int ret = ERR_ERROR; auto extension = GetOwner(); if (extension == nullptr) { HILOG_ERROR("get extension failed."); - return ret; + return ERR_ERROR; } - ret = extension->Mkdir(parent, displayName, newFile); - return ret; + + return extension->Mkdir(parent, displayName, newFile); } int FileAccessExtStubImpl::Delete(const Uri &sourceFile) { - int ret = ERR_ERROR; auto extension = GetOwner(); if (extension == nullptr) { HILOG_ERROR("get extension failed."); - return ret; + return ERR_ERROR; } - ret = extension->Delete(sourceFile); - return ret; + + return extension->Delete(sourceFile); } int FileAccessExtStubImpl::Move(const Uri &sourceFile, const Uri &targetParent, Uri &newFile) { - int ret = ERR_ERROR; auto extension = GetOwner(); if (extension == nullptr) { HILOG_ERROR("get extension failed."); - return ret; + return ERR_ERROR; } - ret = extension->Move(sourceFile, targetParent, newFile); - return ret; + + return extension->Move(sourceFile, targetParent, newFile); } int FileAccessExtStubImpl::Rename(const Uri &sourceFile, const std::string &displayName, Uri &newFile) { - int ret = ERR_ERROR; auto extension = GetOwner(); if (extension == nullptr) { HILOG_ERROR("get extension failed."); - return ret; + return ERR_ERROR; } - ret = extension->Rename(sourceFile, displayName, newFile); - return ret; + + return extension->Rename(sourceFile, displayName, newFile); } std::vector FileAccessExtStubImpl::ListFile(const Uri &sourceFile) -- Gitee