Fix minor cosmetic issues

- Add constexpr expression for constant key variables.
- Move empty destructor into header.
- Add some empty lines for readability.
- Adjust order of includes with alphabetical order.

Change-Id: I77ee7fbb73e113b3dc297f72a88de74de5bbd8d7
Signed-off-by: Junghyun Yeon <jungh.yeon@samsung.com>

diff --git a/src/rpk/rpk_installer.cc b/src/rpk/rpk_installer.cc
index 4f38641..29ab97b 100644 (file)
--- a/src/rpk/rpk_installer.cc
+++ b/src/rpk/rpk_installer.cc
@@ -14,7 +14,7 @@ namespace ci = common_installer;
 
 namespace {
 
-const char kPkgType[] = "rpk";
+constexpr const char kPkgType[] = "rpk";
 
 }  // namespace
 
@@ -24,9 +24,6 @@ RpkInstaller::RpkInstaller(common_installer::PkgMgrPtr pkgmgr)
     : AppInstaller(kPkgType, pkgmgr) {
 }
 
-RpkInstaller::~RpkInstaller() {
-}
-
 std::unique_ptr<ci::ArchiveInfo> RpkInstaller::GetArchiveInfo() {
   return std::make_unique<RpkArchiveInfo>(pkgmgr_->GetRequestInfo(GetIndex()));
 }

diff --git a/src/rpk/rpk_installer.h b/src/rpk/rpk_installer.h
index e1b77de..a030f1a 100644 (file)
--- a/src/rpk/rpk_installer.h
+++ b/src/rpk/rpk_installer.h
@@ -20,7 +20,7 @@ namespace rpk {
 class RpkInstaller : public common_installer::AppInstaller {
  public:
   explicit RpkInstaller(common_installer::PkgMgrPtr pkgmgr);
-  ~RpkInstaller();
+  ~RpkInstaller() {};
   std::unique_ptr<common_installer::ArchiveInfo> GetArchiveInfo() override;
 
  protected:

diff --git a/src/rpk/rpk_registration.cc b/src/rpk/rpk_registration.cc
index d0395dc..51fcbe6 100644 (file)
--- a/src/rpk/rpk_registration.cc
+++ b/src/rpk/rpk_registration.cc
@@ -13,9 +13,11 @@ namespace rpk {
 bool RegisterRpkInfo(manifest_x* manifest, uid_t uid) {
   return true;
 }
+
 bool UpdateRpkInfo(manifest_x* manifest, uid_t uid) {
   return true;
 }
+
 bool UnregisterRpkInfo(const std::string& pkgid, uid_t uid) {
   return true;
 }

diff --git a/src/rpk_manifest_handlers/allowed_package_handler.cc b/src/rpk_manifest_handlers/allowed_package_handler.cc
index 5203b38..51d09ff 100755 (executable)
--- a/src/rpk_manifest_handlers/allowed_package_handler.cc
+++ b/src/rpk_manifest_handlers/allowed_package_handler.cc
@@ -19,14 +19,14 @@ namespace parse {
 
 namespace {
 
-const char kAllowedPackageKey[] = "manifest.allowed-package";
-const char kAllowedPackageIdKey[] = "@id";
+constexpr const char kAllowedPackageKey[] = "manifest.allowed-package";
+constexpr const char kAllowedPackageIdKey[] = "@id";
 
-const char kRequiredPrivilegesKey[] = "required-privileges";
-const char kPrivilegeKey[] = "privilege";
-const char kPrivilegeTextKey[] = "#text";
-const char kPrivilegeTypeKey[] = "@type";
-const char kPrivilegeTypeDefault[] = "rpk";
+constexpr const char kRequiredPrivilegesKey[] = "required-privileges";
+constexpr const char kPrivilegeKey[] = "privilege";
+constexpr const char kPrivilegeTextKey[] = "#text";
+constexpr const char kPrivilegeTypeKey[] = "@type";
+constexpr const char kPrivilegeTypeDefault[] = "rpk";
 
 }  // namespace
 

diff --git a/src/rpk_manifest_handlers/author_handler.cc b/src/rpk_manifest_handlers/author_handler.cc
index e78371c..9f76a9b 100755 (executable)
--- a/src/rpk_manifest_handlers/author_handler.cc
+++ b/src/rpk_manifest_handlers/author_handler.cc
@@ -19,10 +19,10 @@ namespace parse {
 
 namespace {
 
-const char kAuthorKey[] = "manifest.author";
-const char kAuthorKeyText[] = "#text";
-const char kAuthorEmailKey[] = "@email";
-const char kAuthorHrefKey[] = "@href";
+constexpr const char kAuthorKey[] = "manifest.author";
+constexpr const char kAuthorKeyText[] = "#text";
+constexpr const char kAuthorEmailKey[] = "@email";
+constexpr const char kAuthorHrefKey[] = "@href";
 
 void ParseAuthorAndStore(
     const parser::DictionaryValue& author_dict,

diff --git a/src/rpk_manifest_handlers/dependencies_handler.cc b/src/rpk_manifest_handlers/dependencies_handler.cc
index 2645740..b5faca6 100644 (file)
--- a/src/rpk_manifest_handlers/dependencies_handler.cc
+++ b/src/rpk_manifest_handlers/dependencies_handler.cc
@@ -6,11 +6,11 @@
 
 namespace {
 
-const char kDependenciesKey[] = "manifest.dependencies";
-const char kDependencyKey[] = "dependency";
-const char kDependencyTextKey[] = "#text";
-const char kDependencyTypeKey[] = "@type";
-const char kDependencyRequiredVersionKey[] = "@required-version";
+constexpr const char kDependenciesKey[] = "manifest.dependencies";
+constexpr const char kDependencyKey[] = "dependency";
+constexpr const char kDependencyTextKey[] = "#text";
+constexpr const char kDependencyTypeKey[] = "@type";
+constexpr const char kDependencyRequiredVersionKey[] = "@required-version";
 
 }  // namespace
 

diff --git a/src/rpk_manifest_handlers/description_handler.cc b/src/rpk_manifest_handlers/description_handler.cc
index ded5a50..31f1f66 100755 (executable)
--- a/src/rpk_manifest_handlers/description_handler.cc
+++ b/src/rpk_manifest_handlers/description_handler.cc
@@ -52,9 +52,8 @@ bool DescriptionHandler::Parse(
     descriptioninfo(new DescriptionInfoList());
 
   for (auto dict : parser::GetOneOrMany(manifest.value(), kDescriptionKey,
-                                        {})) {
+                                        {}))
     ParseDescriptionAndStore(*dict, descriptioninfo.get());
-  }
 
   *output = std::static_pointer_cast<parser::ManifestData>(descriptioninfo);
   return true;

diff --git a/src/rpk_manifest_handlers/description_handler.h b/src/rpk_manifest_handlers/description_handler.h
index 2a35487..5a641c3 100755 (executable)
--- a/src/rpk_manifest_handlers/description_handler.h
+++ b/src/rpk_manifest_handlers/description_handler.h
@@ -5,9 +5,9 @@
 #ifndef RPK_MANIFEST_HANDLERS_DESCRIPTION_HANDLER_H_
 #define RPK_MANIFEST_HANDLERS_DESCRIPTION_HANDLER_H_
 
-#include <utility>
 #include <memory>
 #include <string>
+#include <utility>
 #include <vector>
 
 #include "manifest_parser/manifest_handler.h"

diff --git a/src/rpk_manifest_handlers/feature_handler.cc b/src/rpk_manifest_handlers/feature_handler.cc
index 1af1b91..b9fede2 100755 (executable)
--- a/src/rpk_manifest_handlers/feature_handler.cc
+++ b/src/rpk_manifest_handlers/feature_handler.cc
@@ -8,10 +8,10 @@
 
 namespace {
 
-const char kFeatureKey[] = "manifest.feature";
-const char kFeatureName[] = "@name";
-const char kFeatureText[] = "#text";
-const char kFeatureRequirementText[] = "true";
+constexpr const char kFeatureKey[] = "manifest.feature";
+constexpr const char kFeatureName[] = "@name";
+constexpr const char kFeatureText[] = "#text";
+constexpr const char kFeatureRequirementText[] = "true";
 
 }  // namespace
 

diff --git a/src/rpk_manifest_handlers/package_handler.cc b/src/rpk_manifest_handlers/package_handler.cc
index cd659e6..ab3b4cc 100755 (executable)
--- a/src/rpk_manifest_handlers/package_handler.cc
+++ b/src/rpk_manifest_handlers/package_handler.cc
@@ -20,13 +20,13 @@ namespace parse {
 
 namespace {
 
-const char kNamespace[] = "@namespace";
-const char kPackage[] = "@package";
-const char kVersion[] = "@version";
-const char kResourceType[] = "@res-type";
-const char kResourceVersion[] = "@res-version";
-const char kApiVersion[] = "@api-version";
-const char kManifestKey[] = "manifest";
+constexpr const char kNamespace[] = "@namespace";
+constexpr const char kPackage[] = "@package";
+constexpr const char kVersion[] = "@version";
+constexpr const char kResourceType[] = "@res-type";
+constexpr const char kResourceVersion[] = "@res-version";
+constexpr const char kApiVersion[] = "@api-version";
+constexpr const char kManifestKey[] = "manifest";
 const std::set<std::string> kPackageTypeAllowedValues =
     {"rpk"};