From 476f918ddeca6437d07d11cc717d84817fcfe451 Mon Sep 17 00:00:00 2001 From: Hwankyu Jhun Date: Tue, 19 Sep 2023 11:01:09 +0900 Subject: [PATCH] Fix static analysis issues Issues: - COPY_INSTEAD_OF_MOVE Change-Id: I1487405d8664a3fc2b056ac747927eb817943312 Signed-off-by: Hwankyu Jhun --- src/launchpad-parser/launchpad_parser_plugin.cc | 13 +++++++------ src/launchpad-parser/launchpad_parser_plugin.hh | 12 ++++++------ 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/src/launchpad-parser/launchpad_parser_plugin.cc b/src/launchpad-parser/launchpad_parser_plugin.cc index 575afd6..e47adf1 100644 --- a/src/launchpad-parser/launchpad_parser_plugin.cc +++ b/src/launchpad-parser/launchpad_parser_plugin.cc @@ -29,11 +29,11 @@ namespace launchpad_parser_plugin { -std::string LaunchpadParser::GetFilePath(std::string id) { +std::string LaunchpadParser::GetFilePath(const std::string& id) { return "/opt/share/loaders/" + id + ".loader"; } -int LaunchpadParser::WriteToFile(std::string pkgid) { +int LaunchpadParser::WriteToFile(const std::string& pkgid) { if (access(LOADERS_DIRECTORY_PATH, F_OK) != 0) mkdir(LOADERS_DIRECTORY_PATH, 0644); @@ -62,7 +62,8 @@ int LaunchpadParser::WriteToFile(std::string pkgid) { return 0; } -bool LaunchpadParser::IsValidId(std::string loader_id, std::string pkgid) { +bool LaunchpadParser::IsValidId(const std::string& loader_id, + const std::string& pkgid) { std::string needle("../"); size_t found = loader_id.find(needle); if (found != std::string::npos) { @@ -85,7 +86,7 @@ bool LaunchpadParser::IsValidId(std::string loader_id, std::string pkgid) { return false; } -int LaunchpadParser::Install(xmlDocPtr doc, std::string pkgid) { +int LaunchpadParser::Install(xmlDocPtr doc, const std::string& pkgid) { pkgmgr_privilege_level level; pkgmgr_installer_info_get_privilege_level(&level); if (level != PM_PRIVILEGE_PLATFORM) { @@ -143,14 +144,14 @@ int LaunchpadParser::Install(xmlDocPtr doc, std::string pkgid) { return 0; } -int LaunchpadParser::Upgrade(xmlDocPtr doc, std::string pkgid) { +int LaunchpadParser::Upgrade(xmlDocPtr doc, const std::string& pkgid) { if (UnInstall(doc, pkgid) != 0) return -1; return Install(doc, pkgid); } -int LaunchpadParser::UnInstall(xmlDocPtr doc, std::string pkgid) { +int LaunchpadParser::UnInstall(xmlDocPtr doc, const std::string& pkgid) { xmlNode* root = xmlDocGetRootElement(doc); if (root == nullptr) return -1; diff --git a/src/launchpad-parser/launchpad_parser_plugin.hh b/src/launchpad-parser/launchpad_parser_plugin.hh index 483fff0..04bb1c5 100644 --- a/src/launchpad-parser/launchpad_parser_plugin.hh +++ b/src/launchpad-parser/launchpad_parser_plugin.hh @@ -29,12 +29,12 @@ namespace launchpad_parser_plugin { class LaunchpadParser { public: - std::string GetFilePath(std::string id); - int WriteToFile(std::string pkgid); - int Install(xmlDocPtr doc, std::string pkgid); - int Upgrade(xmlDocPtr doc, std::string pkgid); - int UnInstall(xmlDocPtr doc, std::string pkgid); - bool IsValidId(std::string loader_id, std::string pkgid); + std::string GetFilePath(const std::string& id); + int WriteToFile(const std::string& pkgid); + int Install(xmlDocPtr doc, const std::string& pkgid); + int Upgrade(xmlDocPtr doc, const std::string& pkgid); + int UnInstall(xmlDocPtr doc, const std::string& pkgid); + bool IsValidId(const std::string& loader_id, const std::string& pkgid); private: std::list> loader_list_; -- 2.7.4