From 6836278762b69294399680241a2a203b3861dc04 Mon Sep 17 00:00:00 2001 From: Sangyoon Jang Date: Fri, 14 May 2021 19:04:34 +0900 Subject: [PATCH] Refine some codes of RwUpgrader Change-Id: Id142e9580736049a9eec3dcf6a6093e4ec54a79b Signed-off-by: Sangyoon Jang --- src/pkg_upgrade/include/rw_upgrader.hh | 2 +- src/pkg_upgrade/src/rw_upgrader.cc | 18 +++++------------- 2 files changed, 6 insertions(+), 14 deletions(-) diff --git a/src/pkg_upgrade/include/rw_upgrader.hh b/src/pkg_upgrade/include/rw_upgrader.hh index a680eed..8bb4dcf 100644 --- a/src/pkg_upgrade/include/rw_upgrader.hh +++ b/src/pkg_upgrade/include/rw_upgrader.hh @@ -29,7 +29,7 @@ class RwUpgrader : public PkgUpgrader { bool Upgrade() override; private: - int UnzipFiles(const char* dest_path); + int UnzipFiles(const std::string& dest_path); int UnzipXml(const std::string& pkgid); int UnzipData(const std::string& pkgid, const std::string& dest); int UnzipPkgFromZip(const std::string& pkgid); diff --git a/src/pkg_upgrade/src/rw_upgrader.cc b/src/pkg_upgrade/src/rw_upgrader.cc index c38425c..e5286bc 100644 --- a/src/pkg_upgrade/src/rw_upgrader.cc +++ b/src/pkg_upgrade/src/rw_upgrader.cc @@ -62,29 +62,21 @@ bool RwUpgrader::Upgrade() { return true; } -int RwUpgrader::UnzipFiles(const char* dest_path) { +int RwUpgrader::UnzipFiles(const std::string& dest_path) { const char* unzip_argv[] = { "/usr/bin/unzip", "-oXqq", kOptZipFile, - dest_path, "-d", "/", nullptr }; - int ret = BackendInvoker::XSystem(unzip_argv); - - return ret; + dest_path.c_str(), "-d", "/", nullptr }; + return BackendInvoker::XSystem(unzip_argv); } int RwUpgrader::UnzipXml(const std::string& pkgid) { std::string path = "opt/share/packages/" + pkgid + ".xml"; - int ret = UnzipFiles(path.c_str()); - - return ret; + return UnzipFiles(path); } int RwUpgrader::UnzipData(const std::string& pkgid, const std::string& dest) { std::string path = dest + pkgid + "/*"; - int ret = UnzipFiles(path.c_str()); - if (ret != 0) - return -1; - - return 0; + return UnzipFiles(path); } int RwUpgrader::UnzipPkgFromZip(const std::string& pkgid) { -- 2.7.4