Coding style fixes

Coding style fixes after running check-coding-style

Change-Id: I74919eb62527ff7f23949a0983fd286c9e366767

diff --git a/src/common/app_installer.h b/src/common/app_installer.h
index 17adb5fb3c40d777ace1e67373e637802755ca94..75befca50ebad829d1b09dc82c7fc8c15ee34ba9 100644 (file)
--- a/src/common/app_installer.h
+++ b/src/common/app_installer.h
@@ -7,13 +7,11 @@
 #define COMMON_APP_INSTALLER_H_
 
 #include <manifest_parser/utils/logging.h>
-
+#include <boost/bind.hpp>
 #include <list>
 #include <memory>
 #include <string>
 
-#include <boost/bind.hpp>
-
 #include "common/pkgmgr_interface.h"
 #include "common/pkgmgr_signal.h"
 #include "common/step/step.h"

diff --git a/src/common/step/step.h b/src/common/step/step.h
index 0e14de732d42ddd3c2e244360233068604105ab2..a3b0ab8a1fb70ef131a767d6ebd6a108d5821c58 100644 (file)
--- a/src/common/step/step.h
+++ b/src/common/step/step.h
@@ -26,9 +26,8 @@
 #ifndef COMMON_STEP_STEP_H_
 #define COMMON_STEP_STEP_H_
 
-#include <string>
-
 #include <boost/signals2.hpp>
+#include <string>
 
 #include "common/installer_context.h"
 

diff --git a/src/common/step/step_backup_icons.h b/src/common/step/step_backup_icons.h
index 2c21fdabd8f1f3cee132be18afa2a05ce4cf121f..49de070b9220a9cf075b885133941f6c47d857ea 100644 (file)
--- a/src/common/step/step_backup_icons.h
+++ b/src/common/step/step_backup_icons.h
@@ -6,11 +6,10 @@
 #define COMMON_STEP_STEP_BACKUP_ICONS_H_
 
 #include <boost/filesystem/path.hpp>
+#include <manifest_parser/utils/logging.h>
 #include <utility>
 #include <vector>
 
-#include <manifest_parser/utils/logging.h>
-
 #include "common/installer_context.h"
 #include "common/step/step.h"
 

diff --git a/src/common/step/step_privilege_compatibility.cc b/src/common/step/step_privilege_compatibility.cc
index 6949008a5c7a8784c459dee70d58229ccf8288be..0f44a58a76cb0bd2f0d94505bf03df1aed04cf9b 100644 (file)
--- a/src/common/step/step_privilege_compatibility.cc
+++ b/src/common/step/step_privilege_compatibility.cc
@@ -53,7 +53,8 @@ bool TranslatePrivilegesForCompatibility(manifest_x* m) {
   g_list_free_full(m->privileges, free);
   m->privileges = nullptr;
   for (GList* l = mapped_privilege_list; l != NULL; l = l->next) {
-    m->privileges = g_list_append(m->privileges, strdup((char*)l->data));
+    m->privileges = g_list_append(m->privileges,
+                                  strdup(reinterpret_cast<char*>(l->data)));
   }
 
   g_list_free_full(mapped_privilege_list, free);
@@ -93,7 +94,8 @@ Step::Status StepPrivilegeCompatibility::process() {
                         strdup(kPrivForPlatform));
       break;
     default:
-      // TODO(jongmyeong.ko): temporarily, public privileges for untrusted application.
+      // TODO(jongmyeong.ko): temporarily, public privileges for untrusted
+      // application.
       context_->manifest_data.get()->privileges =
           g_list_append(context_->manifest_data.get()->privileges,
                         strdup(kPrivForPublic));

diff --git a/src/pkgdir_tool/pkgdir_tool.cc b/src/pkgdir_tool/pkgdir_tool.cc
index 65382607c6b1e794deba1c9540f9787f9c52f253..daa923101f8faa7bd9c61a33fad51917a61ba604 100644 (file)
--- a/src/pkgdir_tool/pkgdir_tool.cc
+++ b/src/pkgdir_tool/pkgdir_tool.cc
@@ -227,7 +227,8 @@ bool CreateSkelDirectories(const std::string& pkgid) {
       return false;
     }
 
-    r = lsetxattr(subpath.c_str(), "security.SMACK64", label.c_str(), label.length(), 0);
+    r = lsetxattr(subpath.c_str(), "security.SMACK64",
+                  label.c_str(), label.length(), 0);
     if (r < 0) {
       LOG(ERROR) << "Failed to apply label";
       return false;

diff --git a/src/tpk/step/step_check_tpk_background_category.cc b/src/tpk/step/step_check_tpk_background_category.cc
index 53ac91b7424eedb63f48c74f3fb6b76723781013..cd2a30cb271dc929eba051b05779d08c80fda9b6 100644 (file)
--- a/src/tpk/step/step_check_tpk_background_category.cc
+++ b/src/tpk/step/step_check_tpk_background_category.cc
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 #include "common/installer_context.h"
-#include "step_check_tpk_background_category.h"
+#include "tpk/step/step_check_tpk_background_category.h"
 
 namespace {
 namespace ci_sec = common_installer::security;

diff --git a/src/wgt/step/step_check_wgt_background_category.cc b/src/wgt/step/step_check_wgt_background_category.cc
index b5efff605987f350e6ccd2390885a3e02ea3dcee..5a1265f0d37a9b6f0a1d909652eeb5e6ac520a1b 100644 (file)
--- a/src/wgt/step/step_check_wgt_background_category.cc
+++ b/src/wgt/step/step_check_wgt_background_category.cc
@@ -5,7 +5,7 @@
 #include <manifest_handlers/setting_handler.h>
 
 #include "common/installer_context.h"
-#include "step_check_wgt_background_category.h"
+#include "wgt/step/step_check_wgt_background_category.h"
 #include "wgt/wgt_backend_data.h"
 
 namespace {