summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHwankyu Jhun <h.jhun@samsung.com>2020-02-25 10:46:17 +0900
committerHwankyu Jhun <h.jhun@samsung.com>2020-02-26 13:38:00 +0900
commit98e4f3af8f57d9faba5a24b4518498ab32054772 (patch)
tree7f6687f1b1327f2dc7faf1ac47099bc5fb02ac6f
parent8d99612c31ea842b87ee749a0ec79203675ed429 (diff)
downloadlaunchpad-98e4f3af8f57d9faba5a24b4518498ab32054772.tar.gz
launchpad-98e4f3af8f57d9faba5a24b4518498ab32054772.tar.bz2
launchpad-98e4f3af8f57d9faba5a24b4518498ab32054772.zip
Adjust coding style
- Uses static_cast<...>(...) instead of C-style cast - Uses left alignment style - Adds C++ coding style check tool Change-Id: I5b0a7817fe9f523027b1a8ee4c2fe4eb5b05d236 Signed-off-by: Hwankyu Jhun <h.jhun@samsung.com>
-rw-r--r--src/app-defined-loader/src/app-defined-loader.cc44
1 files changed, 20 insertions, 24 deletions
diff --git a/src/app-defined-loader/src/app-defined-loader.cc b/src/app-defined-loader/src/app-defined-loader.cc
index 873f52b..38ffb94 100644
--- a/src/app-defined-loader/src/app-defined-loader.cc
+++ b/src/app-defined-loader/src/app-defined-loader.cc
@@ -40,10 +40,6 @@
#define PR_TASK_PERF_USER_TRACE 666
#endif
-#ifndef C_EXPORT
-#define C_EXPORT extern "C" __attribute__((visibility("default")))
-#endif
-
namespace launchpad {
static const char PATH_CONF[] = "/usr/share/aul/app-defined-loader.conf";
@@ -145,9 +141,9 @@ class AppDefinedLoader {
}
}
- static void OnCreate(bundle *extra, int type, void *user_data) {
+ static void OnCreate(bundle* extra, int type, void* user_data) {
_I("on create");
- AppDefinedLoader* loader = (AppDefinedLoader*)user_data;
+ AppDefinedLoader* loader = static_cast<AppDefinedLoader*>(user_data);
tizen_base::Bundle ex = tizen_base::Bundle(extra, false, false);
std::string loader_type = ex.GetString(KEY_LOADER_TYPE);
if (loader_type.empty()) {
@@ -167,15 +163,15 @@ class AppDefinedLoader {
setenv("AUL_HWACC", "hw", 1);
}
- static int OnLaunch(int argc, char **argv, const char *app_path,
- const char *appid, const char *pkgid, const char *pkg_type,
- void *user_data) {
+ static int OnLaunch(int argc, char** argv, const char* app_path,
+ const char* appid, const char* pkgid, const char* pkg_type,
+ void* user_data) {
_I("on launch");
- AppDefinedLoader* loader = (AppDefinedLoader*)user_data;
+ AppDefinedLoader* loader = static_cast<AppDefinedLoader*>(user_data);
if (!loader->IsPriorityChangeEnabled())
return 0;
- bundle *kb = launchpad_loader_get_bundle();
+ bundle* kb = launchpad_loader_get_bundle();
if (kb == nullptr)
return 0;
@@ -229,7 +225,8 @@ class AppDefinedLoader {
if (restore && chdir(old_cwd.c_str()))
_E("failed to chdir: %d", errno);
- void* dl_main = dlsym(handle, "main");
+ auto dl_main = reinterpret_cast<int (*)(int, char **)>(
+ dlsym(handle, "main"));
if (dl_main == nullptr) {
_E("dlsym not founded(%s). Please export 'main' function", dlerror());
dlclose(handle);
@@ -238,14 +235,14 @@ class AppDefinedLoader {
}
_I("call main");
- return ((int (*)(int, char**))dl_main)(argc_, argv_);
+ return dl_main(argc_, argv_);
}
- static int OnTerminate(int argc, char **argv, void *user_data) {
+ static int OnTerminate(int argc, char** argv, void* user_data) {
SECURE_LOGD("[candidate] Launch real application (%s)",
argv[LOADER_ARG_PATH]);
char old_cwd[PATH_MAX] = {0, };
- AppDefinedLoader* loader = (AppDefinedLoader*)user_data;
+ AppDefinedLoader* loader = static_cast<AppDefinedLoader*>(user_data);
if (getcwd(old_cwd, sizeof(old_cwd)) == nullptr) {
loader->DoDlOpen(false, old_cwd, "");
} else {
@@ -280,9 +277,8 @@ class AppDefinedLoader {
ecore_main_loop_quit();
}
- static void OnAddFd(void* user_data, int fd,
- loader_receiver_cb receiver) {
- AppDefinedLoader* loader = (AppDefinedLoader*)user_data;
+ static void OnAddFd(void* user_data, int fd, loader_receiver_cb receiver) {
+ AppDefinedLoader* loader = static_cast<AppDefinedLoader*>(user_data);
Ecore_Fd_Handler* handler = ecore_main_fd_handler_add(fd,
(Ecore_Fd_Handler_Flags)(ECORE_FD_READ | ECORE_FD_ERROR),
FdHandler, loader, nullptr, nullptr);
@@ -296,9 +292,9 @@ class AppDefinedLoader {
loader->SetReceiver(receiver);
}
- static Eina_Bool FdHandler(void *user_data, Ecore_Fd_Handler *handler) {
+ static Eina_Bool FdHandler(void* user_data, Ecore_Fd_Handler* handler) {
_I("fd handler");
- AppDefinedLoader* loader = (AppDefinedLoader*)user_data;
+ AppDefinedLoader* loader = static_cast<AppDefinedLoader*>(user_data);
int fd = ecore_main_fd_handler_fd_get(handler);
if (fd == -1) {
_E("[candidate] ECORE_FD_GET");
@@ -316,9 +312,9 @@ class AppDefinedLoader {
return ECORE_CALLBACK_CANCEL;
}
- static void OnRemoveFd(void *user_data, int fd) {
+ static void OnRemoveFd(void* user_data, int fd) {
_I("remove fd");
- AppDefinedLoader* loader = (AppDefinedLoader*)user_data;
+ AppDefinedLoader* loader = static_cast<AppDefinedLoader*>(user_data);
if (loader->GetFdHandler() == nullptr)
return;
ecore_main_fd_handler_del(loader->GetFdHandler());
@@ -339,9 +335,9 @@ class AppDefinedLoader {
char** argv_;
};
-}
+} // namespace launchpad
-C_EXPORT int main(int argc, char **argv) {
+int main(int argc, char** argv) {
launchpad::AppDefinedLoader loader(argc, argv);
#ifdef TIZEN_FEATURE_LOADER_PRIORITY