Coding style fixes.

Fixing coding style issues found by check-coding-style tool.

Change-Id: I09bce980b003506d281f0bf8b91d547d328971b2

diff --git a/src/common/pkgmgr_interface.cc b/src/common/pkgmgr_interface.cc
index 61f8aaf..ca03b3f 100644 (file)
--- a/src/common/pkgmgr_interface.cc
+++ b/src/common/pkgmgr_interface.cc
@@ -47,7 +47,8 @@ int PkgMgrInterface::InitInternal(int argc, char** argv) {
     // no need to free pkgmgr_installer here. it will be freed in DTOR.
   }
 
-  if (pkgmgr_installer_get_request_type(pi_) == PKGMGR_REQ_MANIFEST_DIRECT_INSTALL) {
+  if (pkgmgr_installer_get_request_type(pi_)
+        == PKGMGR_REQ_MANIFEST_DIRECT_INSTALL) {
     /* Add restrictions for manifest direct install
       * - Directory should be located under /usr/apps/
       * - XML path should be located under /usr/share/packages/
@@ -73,14 +74,14 @@ int PkgMgrInterface::InitInternal(int argc, char** argv) {
       return EINVAL;
     }
 
-    if (directory_path.filename().string().compare(xml_path.stem().string()) != 0) {
+    if (directory_path.filename().string()
+          .compare(xml_path.stem().string()) != 0) {
       LOG(ERROR) << "invalid parameter: directory path "
           << directory_path
           << "xml path"
           << xml_path;
       return EINVAL;
     }
-
   }
 
   is_app_installed_ = false;

diff --git a/src/common/pkgmgr_interface.h b/src/common/pkgmgr_interface.h
index 3cde3ea..2e8a1ba 100644 (file)
--- a/src/common/pkgmgr_interface.h
+++ b/src/common/pkgmgr_interface.h
@@ -6,14 +6,13 @@
 #define COMMON_PKGMGR_INTERFACE_H_
 
 #include <pkgmgr_installer.h>
-
+#include <boost/filesystem/path.hpp>
 #include <memory>
 
 #include "common/app_query_interface.h"
 #include "common/request.h"
 #include "common/utils/macros.h"
 #include "common/utils/logging.h"
-#include <boost/filesystem/path.hpp>
 
 namespace common_installer {
 

diff --git a/src/common/step/step_copy_tep.cc b/src/common/step/step_copy_tep.cc
index cfd5c08..f1d6f95 100644 (file)
--- a/src/common/step/step_copy_tep.cc
+++ b/src/common/step/step_copy_tep.cc
@@ -39,14 +39,14 @@ Step::Status StepCopyTep::precheck() {
 }
 
 Step::Status StepCopyTep::process() {
-
   if (context_->tep_path.get().empty())
     return Step::Status::OK;
 
   context_->pkg_path.set(
     context_->root_application_path.get() / context_->pkgid.get());
 
-  bf::path tep_path = context_->pkg_path.get() / "res" / context_->tep_path.get().filename();
+  bf::path tep_path =
+    context_->pkg_path.get() / "res" / context_->tep_path.get().filename();
   bs::error_code error;
 
   if (context_->is_tep_move.get()) {

diff --git a/src/common/step/step_copy_tep.h b/src/common/step/step_copy_tep.h
index ceead18..79fbb05 100644 (file)
--- a/src/common/step/step_copy_tep.h
+++ b/src/common/step/step_copy_tep.h
@@ -52,10 +52,9 @@ class StepCopyTep : public Step {
   Status precheck() override;
 
   SCOPE_LOG_TAG(CopyTEP)
-
 };
 
 }  // namespace filesystem
 }  // namespace common_installer
 
-#endif  // COMMON_STEP_STEP_TEPCOPY_H_
+#endif  // COMMON_STEP_STEP_COPY_TEP_H_

diff --git a/src/tpk/step/step_parse.cc b/src/tpk/step/step_parse.cc
index 1974942..850858a 100644 (file)
--- a/src/tpk/step/step_parse.cc
+++ b/src/tpk/step/step_parse.cc
@@ -56,9 +56,9 @@ common_installer::Step::Status StepParse::precheck() {
   }
 
   boost::filesystem::path tmp;
-  if (!context_->xml_path.get().empty())
+  if (!context_->xml_path.get().empty()) {
     tmp = context_->xml_path.get();
-  else {
+  } else {
     tmp = context_->unpacked_dir_path.get();
     tmp /= kManifestFileName;
   }
@@ -73,9 +73,9 @@ common_installer::Step::Status StepParse::precheck() {
 
 bool StepParse::LocateConfigFile() {
   boost::filesystem::path manifest;
-  if (!context_->xml_path.get().empty())
+  if (!context_->xml_path.get().empty()) {
     manifest = context_->xml_path.get();
-  else {
+  } else {
     manifest = context_->unpacked_dir_path.get();
     manifest /= kManifestFileName;
   }
@@ -91,9 +91,9 @@ bool StepParse::LocateConfigFile() {
 
 bf::path StepParse::LocateConfigFile() const {
   boost::filesystem::path path;
-  if (!context_->xml_path.get().empty())
+  if (!context_->xml_path.get().empty()) {
     path = context_->xml_path.get();
-  else {
+  } else {
     path = context_->unpacked_dir_path.get();
     path /= kManifestFileName;
   }

diff --git a/src/tpk/tpk_app_query_interface.cc b/src/tpk/tpk_app_query_interface.cc
index 8611d45..ce2f514 100644 (file)
--- a/src/tpk/tpk_app_query_interface.cc
+++ b/src/tpk/tpk_app_query_interface.cc
@@ -99,14 +99,15 @@ bool TpkAppQueryInterface::IsAppInstalledByArgv(int argc, char** argv) {
   std::string path = GetInstallationPackagePath(argc, argv);
   std::string pkg_id;
   if (path.empty()) {
-    //check if it is manifest direct install
+    // check if it is manifest direct install
     path = GetXmlPath(argc, argv);
     if (path.empty())
       return false;
 
     pkg_id = GetPkgIdFromXml(path);
-  } else
+  } else {
     pkg_id = GetPkgIdFromPath(path);
+  }
 
   if (pkg_id.empty())
     return false;

diff --git a/src/wgt/step/step_check_background_category.cc b/src/wgt/step/step_check_background_category.cc
index ae9142f..930d5fc 100644 (file)
--- a/src/wgt/step/step_check_background_category.cc
+++ b/src/wgt/step/step_check_background_category.cc
@@ -4,13 +4,13 @@
 
 #include "wgt/step/step_check_background_category.h"
 
+#include <manifest_handlers/setting_handler.h>
+
 #include <algorithm>
 #include <memory>
 #include <string>
 #include <vector>
 
-#include <manifest_handlers/setting_handler.h>
-
 #include "common/installer_context.h"
 #include "common/utils/glist_range.h"
 #include "common/utils/string_util.h"

diff --git a/src/wgt/step/step_check_background_category.h b/src/wgt/step/step_check_background_category.h
index 2037e92..55eb8e1 100644 (file)
--- a/src/wgt/step/step_check_background_category.h
+++ b/src/wgt/step/step_check_background_category.h
@@ -5,10 +5,10 @@
 #ifndef WGT_STEP_STEP_CHECK_BACKGROUND_CATEGORY_H_
 #define WGT_STEP_STEP_CHECK_BACKGROUND_CATEGORY_H_
 
+#include <manifest_parser/utils/version_number.h>
 #include <glib.h>
 #include <set>
-
-#include <manifest_parser/utils/version_number.h>
+#include <string>
 
 #include "common/step/step.h"
 #include "common/utils/logging.h"