Move GetLightUserList() to user_util.h

Change-Id: Ie58b1fbda5936b4c7172cb09609c0b7290da90df
Signed-off-by: Sangyoon Jang <jeremy.jang@samsung.com>

diff --git a/src/common/step/filesystem/step_remove_files.cc b/src/common/step/filesystem/step_remove_files.cc
index f8ffe97..63d3c6c 100644 (file)
--- a/src/common/step/filesystem/step_remove_files.cc
+++ b/src/common/step/filesystem/step_remove_files.cc
@@ -16,6 +16,7 @@
 
 #include "common/utils/pkgmgr_query.h"
 #include "common/utils/file_util.h"
+#include "common/utils/user_util.h"
 #include "common/shared_dirs.h"
 
 namespace bs = boost::system;

diff --git a/src/common/utils/file_util.cc b/src/common/utils/file_util.cc
index 45bd5bc..76ce1de 100644 (file)
--- a/src/common/utils/file_util.cc
+++ b/src/common/utils/file_util.cc
@@ -8,8 +8,6 @@
 #include <unzip.h>
 #include <zlib.h>
 
-#include <sessiond.h>
-
 #include <boost/algorithm/string/classification.hpp>
 #include <boost/algorithm/string/split.hpp>
 #include <boost/filesystem/operations.hpp>
@@ -741,26 +739,4 @@ bf::path RelativePath(const bf::path& from,
   return result;
 }
 
-std::vector<std::string> GetLightUserList(uid_t uid) {
-  int user_count = 0;
-  subsession_user_t* user_list = nullptr;
-  int ret = subsession_get_user_list(
-      static_cast<int>(uid), &user_list, &user_count);
-  if (ret != TIZEN_ERROR_NONE) {
-    LOG(ERROR) << "Failed to get light user list : " << ret;
-    return {};
-  }
-
-  std::vector<std::string> result_list;
-  for (int i = 0; i < user_count; i++) {
-    if (strlen(user_list[i]) == 0)
-      continue;
-
-    result_list.emplace_back(user_list[i]);
-  }
-
-  std::free(user_list);
-  return result_list;
-}
-
 }  // namespace common_installer

diff --git a/src/common/utils/file_util.h b/src/common/utils/file_util.h
index 983e685..45e943c 100644 (file)
--- a/src/common/utils/file_util.h
+++ b/src/common/utils/file_util.h
@@ -98,8 +98,6 @@ bool IsSubDir(const boost::filesystem::path& path,
 boost::filesystem::path RelativePath(const boost::filesystem::path& from,
                                      const boost::filesystem::path& to);
 
-std::vector<std::string> GetLightUserList(uid_t uid);
-
 }  // namespace common_installer
 
 #endif  // COMMON_UTILS_FILE_UTIL_H_

diff --git a/src/common/utils/user_util.cc b/src/common/utils/user_util.cc
index 6f01bbc..831c27f 100644 (file)
--- a/src/common/utils/user_util.cc
+++ b/src/common/utils/user_util.cc
@@ -5,6 +5,7 @@
 #include "common/utils/user_util.h"
 
 #include <manifest_parser/utils/logging.h>
+#include <sessiond.h>
 
 #include <boost/filesystem/path.hpp>
 
@@ -177,4 +178,26 @@ std::string GetGroupNameByGid(gid_t gid) {
   return entry.gr_name;
 }
 
+std::vector<std::string> GetLightUserList(uid_t uid) {
+  int user_count = 0;
+  subsession_user_t* user_list = nullptr;
+  int ret = subsession_get_user_list(
+      static_cast<int>(uid), &user_list, &user_count);
+  if (ret != TIZEN_ERROR_NONE) {
+    LOG(ERROR) << "Failed to get light user list : " << ret;
+    return {};
+  }
+
+  std::vector<std::string> result_list;
+  for (int i = 0; i < user_count; i++) {
+    if (strlen(user_list[i]) == 0)
+      continue;
+
+    result_list.emplace_back(user_list[i]);
+  }
+
+  std::free(user_list);
+  return result_list;
+}
+
 }  // namespace common_installer

diff --git a/src/common/utils/user_util.h b/src/common/utils/user_util.h
index 051c0af..4c45619 100644 (file)
--- a/src/common/utils/user_util.h
+++ b/src/common/utils/user_util.h
@@ -27,7 +27,7 @@ std::string GetGroupNameByGid(gid_t gid);
 std::string GetUsernameByUid(uid_t user);
 boost::optional<uid_t> GetUidByUserName(const char* username);
 boost::optional<gid_t> GetGidByGroupName(const char* groupname);
-
+std::vector<std::string> GetLightUserList(uid_t uid);
 
 }  // namespace common_installer