Fix minor coding rule

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

diff --git a/parser/include/pkgmgr_query_index.h b/parser/include/pkgmgr_query_index.h
index d59603c..137bde6 100644 (file)
--- a/parser/include/pkgmgr_query_index.h
+++ b/parser/include/pkgmgr_query_index.h
@@ -15,8 +15,8 @@
  *
  */
 
-#ifndef __PKGMGR_QUERY_INDEX_H__
-#define __PKGMGR_QUERY_INDEX_H__
+#ifndef PARSER_INCLUDE_PKGMGR_QUERY_INDEX_H_
+#define PARSER_INCLUDE_PKGMGR_QUERY_INDEX_H_
 
 typedef enum {
        QUERY_INDEX_APPINFO_GET_LOCALED_LABEL = 0,
@@ -50,4 +50,4 @@ typedef enum {
        QUERY_INDEX_MAX
 } QUERY_INDEX;
 
-#endif  /* __PKGMGR_QUERY_INDEX_H__ */
+#endif  /* PARSER_INCLUDE_PKGMGR_QUERY_INDEX_H_ */

diff --git a/src/common/system_locale.cc b/src/common/system_locale.cc
index dd39f4f..f0a12cc 100644 (file)
--- a/src/common/system_locale.cc
+++ b/src/common/system_locale.cc
@@ -67,4 +67,4 @@ void SystemLocale::LanChangedCb(keynode_t* node, void* user_data) {
   sl->SetLocale();
 }
 
-}  // namespace pkgmgr_common
\ No newline at end of file
+}  // namespace pkgmgr_common

diff --git a/src/server/database/abstract_db_handler.cc b/src/server/database/abstract_db_handler.cc
index 3bdb75b..8aa4739 100644 (file)
--- a/src/server/database/abstract_db_handler.cc
+++ b/src/server/database/abstract_db_handler.cc
@@ -170,7 +170,8 @@ std::vector<std::pair<std::string, uid_t>> AbstractDBHandler::GetDBPath() {
   else if (db_type_ == pkgmgr_common::DBType::DB_TYPE_FILE_CERTDB)
     db_path.emplace_back(
         std::make_pair(DBHandleProvider::GetInst(uid_).GetCertDBPath(pid_,
-            op_type_ == pkgmgr_common::DBOperationType::OPERATION_TYPE_WRITE), uid_));
+            op_type_ == pkgmgr_common::DBOperationType::OPERATION_TYPE_WRITE),
+            uid_));
 
   return db_path;
 }
@@ -188,7 +189,8 @@ bool AbstractDBHandler::Connect() {
     int ret = 0;
     if (op_type_ == pkgmgr_common::DBOperationType::OPERATION_TYPE_READ) {
       ret = __open_read_db(dbpath.first.c_str(), &db);
-    } else if (op_type_ == pkgmgr_common::DBOperationType::OPERATION_TYPE_WRITE) {
+    } else if (
+        op_type_ == pkgmgr_common::DBOperationType::OPERATION_TYPE_WRITE) {
       if (ConvertUID(dbpath.second) != ConvertUID(uid_))
         continue;
       ret = __open_write_db(uid_, dbpath.first.c_str(), &db);

diff --git a/src/server/database/query_handler.cc b/src/server/database/query_handler.cc
index e1f90c5..a67e16d 100644 (file)
--- a/src/server/database/query_handler.cc
+++ b/src/server/database/query_handler.cc
@@ -185,7 +185,7 @@ class QueryMaker {
 QueryMaker __query_maker;
 
 void __free_argument(gpointer data) {
-  query_args* args = (query_args*)data;
+  query_args* args = reinterpret_cast<query_args*>(data);
   g_list_free(args->argument);
   free(args);
 }
@@ -236,7 +236,8 @@ int QueryHandler::Execute() {
     }
 
     queries = g_list_append(queries, (gpointer)query);
-    query_args* arg = (query_args*)calloc(1, sizeof(query_args));
+    query_args* arg = reinterpret_cast<query_args*>(
+        calloc(1, sizeof(query_args)));
     if (arg == nullptr) {
       LOG(ERROR) << "Out of memory";
       __free_query_list(queries, args_list);
@@ -260,7 +261,7 @@ int QueryHandler::Execute() {
         int row = 0;
         int col = 0;
 
-        query_args* params = (query_args*)it->data;
+        query_args* params = reinterpret_cast<query_args*>(it->data);
         ret = get_query_result(conn.first, (const char *)queries->data,
             params->argument, &list, &row, &col);
         if (ret == PMINFO_R_ERROR) {
@@ -298,7 +299,6 @@ int QueryHandler::Execute() {
     }
     __free_query_list(queries, args_list);
     return ret;
-
   }
   return ret;
 }

diff --git a/src/server/request_handler/request_handler_direct_access.cc b/src/server/request_handler/request_handler_direct_access.cc
index 904662c..3fa03e8 100644 (file)
--- a/src/server/request_handler/request_handler_direct_access.cc
+++ b/src/server/request_handler/request_handler_direct_access.cc
@@ -73,10 +73,12 @@ extern "C" EXPORT_API void* _request_handler_direct_access(int req_type,
       handler.reset(new pkgmgr_server::request_handler::QueryRequestHandler());
       break;
     case pkgmgr_common::ReqType::COMMAND:
-      handler.reset(new pkgmgr_server::request_handler::CommandRequestHandler());
+      handler.reset(
+          new pkgmgr_server::request_handler::CommandRequestHandler());
       break;
     case pkgmgr_common::ReqType::CREATE_DB:
-      handler.reset(new pkgmgr_server::request_handler::CreateDBRequestHandler());
+      handler.reset(
+          new pkgmgr_server::request_handler::CreateDBRequestHandler());
       break;
     default:
       handler.reset(nullptr);

diff --git a/src/server/request_handler/request_handler_direct_access.h b/src/server/request_handler/request_handler_direct_access.h
index a7b01be..e7c2c0e 100644 (file)
--- a/src/server/request_handler/request_handler_direct_access.h
+++ b/src/server/request_handler/request_handler_direct_access.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef REQUEST_HANDLER_DIRECT_ACCESS_H_
-#define REQUEST_HANDLER_DIRECT_ACCESS_H_
+#ifndef SERVER_REQUEST_HANDLER_REQUEST_HANDLER_DIRECT_ACCESS_H_
+#define SERVER_REQUEST_HANDLER_REQUEST_HANDLER_DIRECT_ACCESS_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -27,4 +27,4 @@ void *_request_handler_direct_access(int req_type, unsigned char* data,
 #ifdef __cplusplus
 }
 #endif
-#endif  /* REQUEST_HANDLER_DIRECT_ACCESS_H_ */
+#endif  /* SERVER_REQUEST_HANDLER_REQUEST_HANDLER_DIRECT_ACCESS_H_ */

diff --git a/src/server/runner.cc b/src/server/runner.cc
index 8d7184c..1c2b077 100644 (file)
--- a/src/server/runner.cc
+++ b/src/server/runner.cc
@@ -41,7 +41,8 @@ namespace pkgmgr_server {
 namespace {
 
 static const std::string SOCK_PATH = "/run/pkgmgr-info-server";
-const char PRIVILEGE_PACKAGE_MANAGER_ADMIN[] = "http://tizen.org/privilege/packagemanager.admin";
+const char PRIVILEGE_PACKAGE_MANAGER_ADMIN[] =
+    "http://tizen.org/privilege/packagemanager.admin";
 
 std::vector<std::string> GetPrivileges(pkgmgr_common::ReqType type) {
   std::vector<std::string> ret;

diff --git a/test/unit_tests/test_query_db_handlers.cc b/test/unit_tests/test_query_db_handlers.cc
index 56f01fb..8fdc19e 100644 (file)
--- a/test/unit_tests/test_query_db_handlers.cc
+++ b/test/unit_tests/test_query_db_handlers.cc
@@ -144,7 +144,8 @@ TEST_F(ParserDBHandlerTest, QueryDBHandler_PluginInfoTest) {
       std::vector<std::pair<int, std::vector<std::optional<std::string>>>>{
           std::make_pair(
               QUERY_INDEX_PLUGININFO_GET_APPIDS,
-              std::vector<std::optional<std::string>>{pkgid, plugin_type, plugin_name})});
+              std::vector<std::optional<std::string>>{
+                  pkgid, plugin_type, plugin_name})});
   get_query_handler.SetDBType(pkgmgr_common::DBType::DB_TYPE_FILE_PKGDB);
   get_query_handler.SetOpType(
       pkgmgr_common::DBOperationType::OPERATION_TYPE_READ);
@@ -172,7 +173,8 @@ TEST_F(ParserDBHandlerTest, QueryDBHandler_GetLocaledLabelTest) {
       .WillOnce(testing::Return(GetDBHandles()));
   ASSERT_EQ(pkg_set_db_handler.Execute(), 0);
 
-  std::vector<std::pair<int, std::vector<std::optional<std::string>>>> query_args;
+  std::vector<std::pair<int,
+      std::vector<std::optional<std::string>>>> query_args;
   std::vector<std::vector<std::optional<std::string>>> expected_label;
   for (GList* app_list = ptr.get()->application; app_list;
       app_list = app_list->next) {
@@ -220,7 +222,8 @@ TEST_F(ParserDBHandlerTest, QueryDBHandler_GetDataControlTest) {
       .WillOnce(testing::Return(GetDBHandles()));
   ASSERT_EQ(pkg_set_db_handler.Execute(), 0);
 
-  std::vector<std::pair<int, std::vector<std::optional<std::string>>>> query_args;
+  std::vector<std::pair<int,
+      std::vector<std::optional<std::string>>>> query_args;
   std::vector<std::vector<std::optional<std::string>>> expected_label;
   for (GList* app_list = ptr.get()->application; app_list;
       app_list = app_list->next) {
@@ -269,7 +272,8 @@ TEST_F(ParserDBHandlerTest, QueryDBHandler_GetDataControlAppIdTest) {
       .WillOnce(testing::Return(GetDBHandles()));
   ASSERT_EQ(pkg_set_db_handler.Execute(), 0);
 
-  std::vector<std::pair<int, std::vector<std::optional<std::string>>>> query_args;
+  std::vector<std::pair<int,
+      std::vector<std::optional<std::string>>>> query_args;
   std::vector<std::vector<std::optional<std::string>>> expected_appids;
   std::map<std::string, std::vector<std::optional<std::string>>> provider_map;
   for (GList* app_list = ptr.get()->application; app_list;