From a0e2b902f8e3692a84c14d7e42765d387b1eff9d Mon Sep 17 00:00:00 2001 From: Piotr Ganicz Date: Fri, 13 Jan 2017 13:12:32 +0100 Subject: [PATCH 1/1] Styel check Change-Id: I102408c0f7ff520be398dbf102f5711954c283c5 --- src/hybrid/step/pkgmgr/step_generate_xml.cc | 1 + src/unit_tests/smoke_test.cc | 7 +- src/wgt/extension_config_parser.cc | 3 + src/wgt/extension_config_parser.h | 2 + src/wgt/step/configuration/step_parse.cc | 3 +- src/wgt/step/configuration/step_parse_recovery.cc | 2 +- src/wgt/step/encryption/step_encrypt_resources.cc | 1 + .../step/encryption/step_remove_encryption_data.h | 1 + .../security/step_check_extension_privileges.cc | 4 +- .../security/step_check_wgt_background_category.cc | 2 + .../step/security/step_check_wgt_ime_privilege.cc | 5 +- .../step/security/step_check_wgt_ime_privilege.h | 1 + .../step_check_wgt_notification_category.cc | 4 +- .../step_check_wgt_notification_category.h | 1 + src/wgt/wgt_app_query_interface.cc | 2 +- src/wgt/wgt_installer.cc | 197 +++++++++++++++------ src/wgt/wgt_installer.h | 22 +++ 17 files changed, 190 insertions(+), 68 deletions(-) diff --git a/src/hybrid/step/pkgmgr/step_generate_xml.cc b/src/hybrid/step/pkgmgr/step_generate_xml.cc index df049ff..2004179 100644 --- a/src/hybrid/step/pkgmgr/step_generate_xml.cc +++ b/src/hybrid/step/pkgmgr/step_generate_xml.cc @@ -16,6 +16,7 @@ #include #include +#include #include #include diff --git a/src/unit_tests/smoke_test.cc b/src/unit_tests/smoke_test.cc index 66ca801..38193da 100644 --- a/src/unit_tests/smoke_test.cc +++ b/src/unit_tests/smoke_test.cc @@ -50,9 +50,9 @@ const uid_t kDefaultUserUid = tzplatform_getuid(TZ_SYS_DEFAULT_USER); const uid_t kTestUserId = kGlobalUserUid; const gid_t kTestGroupId = kGlobalUserGid; const char kSystemShareGroupName[] = "system_share"; -const std::string kTestUserIdStr = +const std::string& kTestUserIdStr = std::to_string(kTestUserId); -const std::string kDefaultUserIdStr = std::to_string(kDefaultUserUid); +const std::string& kDefaultUserIdStr = std::to_string(kDefaultUserUid); const char kLegacyExtImageDir[] = "legacy_extimage_dir"; const char kMigrateTestDBName[] = "app2sd_migrate.db"; @@ -1153,7 +1153,8 @@ TEST_F(SmokeTest, InstallExternalMode) { TEST_F(SmokeTest, MigrateLegacyExternalImageMode) { ASSERT_TRUE(CheckAvailableExternalPath()); - bf::path path = kSmokePackagesDirectory / "MigrateLegacyExternalImageMode.wgt"; + bf::path path = + kSmokePackagesDirectory / "MigrateLegacyExternalImageMode.wgt"; std::string pkgid = "smokeapp36"; std::string appid = "smokeapp36.web"; bf::path legacy_path = kSmokePackagesDirectory / kLegacyExtImageDir; diff --git a/src/wgt/extension_config_parser.cc b/src/wgt/extension_config_parser.cc index 1a1258d..2409389 100755 --- a/src/wgt/extension_config_parser.cc +++ b/src/wgt/extension_config_parser.cc @@ -12,6 +12,7 @@ namespace wgt { namespace { + const xmlChar kExtensionNodeKey[] = "extension"; const xmlChar kNamePrivilegeKey[] = "privilege"; const xmlChar kPrivigeNameAttributeKey[] = "name"; @@ -21,6 +22,7 @@ const char kXmlTextKey[] = "#text"; const char kNamespaceKey[] = "@namespace"; const char kExtensionPath[] = "extension.privilege"; const char kExtensionNameKey[] = "@name"; + } // namespace ExtensionConfigParser::ExtensionConfigParser(std::string config_xml) @@ -186,4 +188,5 @@ std::vector ExtensionConfigParser::GetExtensionPrivilegeList() { } return privilege_list; } + } // namespace wgt diff --git a/src/wgt/extension_config_parser.h b/src/wgt/extension_config_parser.h index c5cd454..915497e 100755 --- a/src/wgt/extension_config_parser.h +++ b/src/wgt/extension_config_parser.h @@ -10,6 +10,7 @@ #include #include +#include #include #include #include @@ -31,6 +32,7 @@ class ExtensionConfigParser { xmlNode* root, const std::string& inherit_dir = ""); std::string config_xml_; }; + } // namespace wgt #endif // WGT_EXTENSION_CONFIG_PARSER_H_ diff --git a/src/wgt/step/configuration/step_parse.cc b/src/wgt/step/configuration/step_parse.cc index d9a96ba..01ae9bc 100644 --- a/src/wgt/step/configuration/step_parse.cc +++ b/src/wgt/step/configuration/step_parse.cc @@ -54,7 +54,7 @@ const char kCategoryWearableClock[] = "http://tizen.org/category/wearable_clock"; const char kCategoryWatchClock[] = "com.samsung.wmanager.WATCH_CLOCK"; -const std::string kManifestVersion = "1.0.0"; +const char kManifestVersion[] = "1.0.0"; const char kTizenPackageXmlNamespace[] = "http://tizen.org/ns/packages"; const char kImeCategoryName[] = "http://tizen.org/category/ime"; const char kDownloadableFontCategoryName[] = @@ -119,6 +119,7 @@ void AppendLabel(T* root, const std::string& label, strdup(locale.c_str()) : strdup(DEFAULT_LOCALE); root->label = g_list_append(root->label, label_item); } + } // namespace namespace wgt { diff --git a/src/wgt/step/configuration/step_parse_recovery.cc b/src/wgt/step/configuration/step_parse_recovery.cc index 8ff406d..36b472c 100644 --- a/src/wgt/step/configuration/step_parse_recovery.cc +++ b/src/wgt/step/configuration/step_parse_recovery.cc @@ -11,7 +11,7 @@ namespace { const char kResWgtPath[] = "res/wgt"; -} +} // namespace namespace wgt { namespace configuration { diff --git a/src/wgt/step/encryption/step_encrypt_resources.cc b/src/wgt/step/encryption/step_encrypt_resources.cc index 9c6b9d8..dc4b6ec 100644 --- a/src/wgt/step/encryption/step_encrypt_resources.cc +++ b/src/wgt/step/encryption/step_encrypt_resources.cc @@ -20,6 +20,7 @@ #include #include #include +#include namespace { diff --git a/src/wgt/step/encryption/step_remove_encryption_data.h b/src/wgt/step/encryption/step_remove_encryption_data.h index 0fe8d67..691760b 100644 --- a/src/wgt/step/encryption/step_remove_encryption_data.h +++ b/src/wgt/step/encryption/step_remove_encryption_data.h @@ -33,6 +33,7 @@ class StepRemoveEncryptionData : public common_installer::Step { STEP_NAME(RemoveEncryptionData) }; + } // namespace encryption } // namespace wgt diff --git a/src/wgt/step/security/step_check_extension_privileges.cc b/src/wgt/step/security/step_check_extension_privileges.cc index 2e8d2a2..47f874e 100755 --- a/src/wgt/step/security/step_check_extension_privileges.cc +++ b/src/wgt/step/security/step_check_extension_privileges.cc @@ -25,11 +25,13 @@ #include "wgt/extension_config_parser.h" namespace { + const char kPluginsDirectory[] = "/res/wgt/plugin/"; const char kArchArmv7l[] = "armv7l"; const char kArchI586[] = "i586"; const char kArchDefault[] = "default"; -} + +} // namespace namespace wgt { namespace security { diff --git a/src/wgt/step/security/step_check_wgt_background_category.cc b/src/wgt/step/security/step_check_wgt_background_category.cc index cd59ef6..b3d6a2c 100644 --- a/src/wgt/step/security/step_check_wgt_background_category.cc +++ b/src/wgt/step/security/step_check_wgt_background_category.cc @@ -10,7 +10,9 @@ #include "wgt/wgt_backend_data.h" namespace { + namespace ci_sec = common_installer::security; + } // namespace namespace wgt { diff --git a/src/wgt/step/security/step_check_wgt_ime_privilege.cc b/src/wgt/step/security/step_check_wgt_ime_privilege.cc index aedbbaf..2703b7e 100644 --- a/src/wgt/step/security/step_check_wgt_ime_privilege.cc +++ b/src/wgt/step/security/step_check_wgt_ime_privilege.cc @@ -13,8 +13,10 @@ #include namespace { + const char kImeCategoryName[] = "http://tizen.org/category/ime"; -} + +} // namespace namespace wgt { namespace security { @@ -86,5 +88,6 @@ StepCheckWgtImePrivilege::CheckImePrivilege() const { LOG(DEBUG) << "Missing IME privilege."; return Status::PRIVILEGE_ERROR; } + } // namespace security } // namespace wgt diff --git a/src/wgt/step/security/step_check_wgt_ime_privilege.h b/src/wgt/step/security/step_check_wgt_ime_privilege.h index 04f49c8..192ae2e 100644 --- a/src/wgt/step/security/step_check_wgt_ime_privilege.h +++ b/src/wgt/step/security/step_check_wgt_ime_privilege.h @@ -33,6 +33,7 @@ class StepCheckWgtImePrivilege : STEP_NAME(CheckWgtImePrivilege) }; + } // namespace security } // namespace wgt diff --git a/src/wgt/step/security/step_check_wgt_notification_category.cc b/src/wgt/step/security/step_check_wgt_notification_category.cc index 67eca45..8057035 100644 --- a/src/wgt/step/security/step_check_wgt_notification_category.cc +++ b/src/wgt/step/security/step_check_wgt_notification_category.cc @@ -9,9 +9,11 @@ #include namespace { + const char kNotificationCategoryName[] = "http://tizen.org/category/always_on_top"; -} + +} // namespace namespace wgt { namespace security { diff --git a/src/wgt/step/security/step_check_wgt_notification_category.h b/src/wgt/step/security/step_check_wgt_notification_category.h index 842b531..1d52f71 100644 --- a/src/wgt/step/security/step_check_wgt_notification_category.h +++ b/src/wgt/step/security/step_check_wgt_notification_category.h @@ -27,6 +27,7 @@ class StepCheckWgtNotificationCategory : STEP_NAME(CheckWgtNotificationCategory) }; + } // namespace security } // namespace wgt diff --git a/src/wgt/wgt_app_query_interface.cc b/src/wgt/wgt_app_query_interface.cc index 8c75226..a2bd61d 100644 --- a/src/wgt/wgt_app_query_interface.cc +++ b/src/wgt/wgt_app_query_interface.cc @@ -24,10 +24,10 @@ #include #include +#include #include #include - namespace bf = boost::filesystem; namespace bs = boost::system; namespace ci = common_installer; diff --git a/src/wgt/wgt_installer.cc b/src/wgt/wgt_installer.cc index 337f446..9413c22 100755 --- a/src/wgt/wgt_installer.cc +++ b/src/wgt/wgt_installer.cc @@ -113,6 +113,87 @@ WgtInstaller::WgtInstaller(ci::PkgMgrPtr pkgrmgr) /* treat the request */ switch (pkgmgr_->GetRequestType()) { case ci::RequestType::Install : { + InstallSteps(); + break; + } + case ci::RequestType::Update: { + UpdateSteps(); + break; + } + case ci::RequestType::Uninstall: { + UninstallSteps(); + break; + } + case ci::RequestType::Reinstall: { + ReinstallSteps(); + break; + } + case ci::RequestType::Delta: { + DeltaSteps(); + break; + } + case ci::RequestType::Recovery: { + RecoverySteps(); + break; + } + case ci::RequestType::MountInstall: { + MountInstallSteps(); + break; + } + case ci::RequestType::MountUpdate: { + MountUpdateSteps(); + break; + } + case ci::RequestType::ManifestDirectInstall: { + ManifestDirectInstallSteps(); + break; + } + case ci::RequestType::ManifestDirectUpdate: { + ManifestDirectUpdateSteps(); + break; + } + case ci::RequestType::ReadonlyUpdateInstall: { + ReadonlyUpdateInstallSteps(); + break; + } + case ci::RequestType::ReadonlyUpdateUninstall: { + ReadonlyUpdateUninstallSteps(); + break; + } + case ci::RequestType::ManifestPartialInstall: { + ManifestPartialInstallSteps(); + break; + } + case ci::RequestType::ManifestPartialUpdate: { + ManifestPartialUpdateSteps(); + break; + } + case ci::RequestType::PartialUninstall: { + ManifestPartialUninstallSteps(); + break; + } + case ci::RequestType::Move: { + MoveSteps(); + break; + } + case ci::RequestType::EnablePkg: { + EnablePkgSteps(); + break; + } + case ci::RequestType::DisablePkg: { + DisablePkgSteps(); + break; + } + case ci::RequestType::MigrateExtImg: { + MigrateExtImgSteps(); + break; + } + default: { + DefaultSteps(); + } + } +} + void WgtInstaller::InstallSteps() { AddStep(pkgmgr_); AddStep(); AddStep( @@ -151,9 +232,9 @@ WgtInstaller::WgtInstaller(ci::PkgMgrPtr pkgrmgr) wgt::filesystem::WgtAdditionalSharedDirs); AddStep(); AddStep(); - break; - } - case ci::RequestType::Update: { + } + + void WgtInstaller::UpdateSteps() { AddStep(pkgmgr_); AddStep(); AddStep( @@ -195,9 +276,9 @@ WgtInstaller::WgtInstaller(ci::PkgMgrPtr pkgrmgr) ci::Plugin::ActionType::Upgrade); AddStep(); AddStep(); - break; - } - case ci::RequestType::Uninstall: { + } + + void WgtInstaller::UninstallSteps() { AddStep(pkgmgr_); AddStep(); AddStep(); @@ -221,9 +302,9 @@ WgtInstaller::WgtInstaller(ci::PkgMgrPtr pkgrmgr) AddStep(); AddStep(); AddStep(); - break; - } - case ci::RequestType::Reinstall: { + } + + void WgtInstaller::ReinstallSteps() { AddStep(pkgmgr_); AddStep(); AddStep( @@ -244,9 +325,9 @@ WgtInstaller::WgtInstaller(ci::PkgMgrPtr pkgrmgr) AddStep(); AddStep(); AddStep(); - break; - } - case ci::RequestType::Delta: { + } + + void WgtInstaller::DeltaSteps() { AddStep(pkgmgr_); AddStep(); AddStep( @@ -292,9 +373,9 @@ WgtInstaller::WgtInstaller(ci::PkgMgrPtr pkgrmgr) ci::Plugin::ActionType::Upgrade); AddStep(); AddStep(); - break; - } - case ci::RequestType::Recovery: { + } + + void WgtInstaller::RecoverySteps() { AddStep(pkgmgr_); AddStep(); AddStep( @@ -311,9 +392,9 @@ WgtInstaller::WgtInstaller(ci::PkgMgrPtr pkgrmgr) AddStep(); AddStep(); AddStep(); - break; - } - case ci::RequestType::MountInstall: { + } + + void WgtInstaller::MountInstallSteps() { AddStep(pkgmgr_); AddStep(); AddStep( @@ -351,9 +432,9 @@ WgtInstaller::WgtInstaller(ci::PkgMgrPtr pkgrmgr) wgt::filesystem::WgtAdditionalSharedDirs); AddStep(); AddStep(); - break; - } - case ci::RequestType::MountUpdate: { + } + + void WgtInstaller::MountUpdateSteps() { AddStep(pkgmgr_); AddStep(); AddStep( @@ -392,9 +473,9 @@ WgtInstaller::WgtInstaller(ci::PkgMgrPtr pkgrmgr) ci::Plugin::ActionType::Upgrade); AddStep(); AddStep(); - break; - } - case ci::RequestType::ManifestDirectInstall: { + } + + void WgtInstaller::ManifestDirectInstallSteps() { AddStep(pkgmgr_); AddStep( wgt::configuration::StepParse::ConfigLocation::INSTALLED, true); @@ -419,9 +500,9 @@ WgtInstaller::WgtInstaller(ci::PkgMgrPtr pkgrmgr) wgt::filesystem::WgtAdditionalSharedDirs); AddStep(); AddStep(); - break; - } - case ci::RequestType::ManifestDirectUpdate: { + } + + void WgtInstaller::ManifestDirectUpdateSteps() { AddStep(pkgmgr_); AddStep( wgt::configuration::StepParse::ConfigLocation::INSTALLED, true); @@ -448,9 +529,9 @@ WgtInstaller::WgtInstaller(ci::PkgMgrPtr pkgrmgr) ci::Plugin::ActionType::Upgrade); AddStep(); AddStep(); - break; - } - case ci::RequestType::ReadonlyUpdateInstall: { + } + + void WgtInstaller::ReadonlyUpdateInstallSteps() { AddStep(pkgmgr_); AddStep(); AddStep( @@ -489,9 +570,9 @@ WgtInstaller::WgtInstaller(ci::PkgMgrPtr pkgrmgr) AddStep(ci::Plugin::ActionType::Upgrade); AddStep(); AddStep(); - break; - } - case ci::RequestType::ReadonlyUpdateUninstall: { + } + + void WgtInstaller::ReadonlyUpdateUninstallSteps() { AddStep(pkgmgr_); AddStep(); AddStep(); @@ -514,9 +595,9 @@ WgtInstaller::WgtInstaller(ci::PkgMgrPtr pkgrmgr) AddStep(); AddStep(); AddStep(ci::Plugin::ActionType::Upgrade); - break; - } - case ci::RequestType::ManifestPartialInstall: { + } + + void WgtInstaller::ManifestPartialInstallSteps() { AddStep(pkgmgr_); AddStep( wgt::configuration::StepParse::ConfigLocation::INSTALLED, true); @@ -531,9 +612,9 @@ WgtInstaller::WgtInstaller(ci::PkgMgrPtr pkgrmgr) AddStep( wgt::filesystem::WgtAdditionalSharedDirs); AddStep(); - break; - } - case ci::RequestType::ManifestPartialUpdate: { + } + + void WgtInstaller::ManifestPartialUpdateSteps() { AddStep(pkgmgr_); AddStep( wgt::configuration::StepParse::ConfigLocation::INSTALLED, true); @@ -550,9 +631,9 @@ WgtInstaller::WgtInstaller(ci::PkgMgrPtr pkgrmgr) AddStep( ci::Plugin::ActionType::Upgrade); AddStep(); - break; - } - case ci::RequestType::PartialUninstall: { + } + + void WgtInstaller::ManifestPartialUninstallSteps() { AddStep(pkgmgr_); AddStep(); AddStep(); @@ -568,9 +649,9 @@ WgtInstaller::WgtInstaller(ci::PkgMgrPtr pkgrmgr) AddStep(); AddStep(); AddStep(); - break; - } - case ci::RequestType::Move: { + } + + void WgtInstaller::MoveSteps() { AddStep(pkgmgr_); AddStep( ci::configuration::StepParseManifest::ManifestLocation::INSTALLED, @@ -578,9 +659,9 @@ WgtInstaller::WgtInstaller(ci::PkgMgrPtr pkgrmgr) AddStep(); AddStep(); AddStep(); - break; - } - case ci::RequestType::EnablePkg: { + } + + void WgtInstaller::EnablePkgSteps() { AddStep(pkgmgr_); AddStep( ci::configuration::StepParseManifest::ManifestLocation::INSTALLED, @@ -590,9 +671,9 @@ WgtInstaller::WgtInstaller(ci::PkgMgrPtr pkgrmgr) ci::pkgmgr::StepUpdatePkgDisableInfo::ActionType::Enable); AddStep( ci::Plugin::ActionType::Uninstall); - break; - } - case ci::RequestType::DisablePkg: { + } + + void WgtInstaller::DisablePkgSteps() { AddStep(pkgmgr_); AddStep( ci::configuration::StepParseManifest::ManifestLocation::INSTALLED, @@ -602,18 +683,16 @@ WgtInstaller::WgtInstaller(ci::PkgMgrPtr pkgrmgr) ci::pkgmgr::StepUpdatePkgDisableInfo::ActionType::Disable); AddStep( ci::Plugin::ActionType::Uninstall); - break; - } - case ci::RequestType::MigrateExtImg: { + } + + void WgtInstaller::MigrateExtImgSteps() { AddStep(pkgmgr_); AddStep(); AddStep(); - break; - } - default: { + } + + void WgtInstaller::DefaultSteps() { AddStep(); - } } -} } // namespace wgt diff --git a/src/wgt/wgt_installer.h b/src/wgt/wgt_installer.h index 7a06a31..0c3a5e9 100644 --- a/src/wgt/wgt_installer.h +++ b/src/wgt/wgt_installer.h @@ -24,6 +24,28 @@ class WgtInstaller : public common_installer::AppInstaller { * \param pkgmgr pointer to pkgmgr */ explicit WgtInstaller(common_installer::PkgMgrPtr pkgrmgr); + + private: + void InstallSteps(); + void UpdateSteps(); + void UninstallSteps(); + void ReinstallSteps(); + void DeltaSteps(); + void RecoverySteps(); + void MountInstallSteps(); + void MountUpdateSteps(); + void ManifestDirectInstallSteps(); + void ManifestDirectUpdateSteps(); + void ReadonlyUpdateInstallSteps(); + void ReadonlyUpdateUninstallSteps(); + void ManifestPartialInstallSteps(); + void ManifestPartialUpdateSteps(); + void ManifestPartialUninstallSteps(); + void MoveSteps(); + void EnablePkgSteps(); + void DisablePkgSteps(); + void MigrateExtImgSteps(); + void DefaultSteps(); }; } // namespace wgt -- 2.7.4