From 33d28f099a65ccd7734bfb15297fc279d509900e Mon Sep 17 00:00:00 2001 From: Suyeon Hwang Date: Tue, 29 Nov 2022 17:33:03 +0900 Subject: [PATCH] Change file format from c to cpp - Requirement: It is hard to assure thread safe in C based code. - Solution: This patch changes the file format of vc_config_mgr from c to cpp. Through this patch, refactoring vc_config_mgr will become easier. Change-Id: I0cf1c672daf74daa97d759564f2610a0074ff127 Signed-off-by: Suyeon Hwang --- client/CMakeLists.txt | 8 ++--- common/{vc_config_mgr.c => vc_config_mgr.cpp} | 34 +++++++++---------- common/vc_config_parser.c | 5 ++- server/CMakeLists.txt | 2 +- 4 files changed, 26 insertions(+), 23 deletions(-) rename common/{vc_config_mgr.c => vc_config_mgr.cpp} (98%) diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt index c5e8b31..1d144d2 100644 --- a/client/CMakeLists.txt +++ b/client/CMakeLists.txt @@ -7,7 +7,7 @@ SET(SRCS ../common/vc_cmd_db.c ../common/vc_command.c ../common/vc_command_util.c - ../common/vc_config_mgr.c + ../common/vc_config_mgr.cpp ../common/vc_config_parser.c ../common/vc_info_parser.c ../common/vc_json_parser.c @@ -17,7 +17,7 @@ SET(SETTING_SRCS vc_setting_tidl.c vc_setting_proxy.c vc_setting.c - ../common/vc_config_mgr.c + ../common/vc_config_mgr.cpp ../common/vc_config_parser.c ) @@ -30,7 +30,7 @@ SET(WIDGET_SRCS ../common/vc_cmd_db.c ../common/vc_command.c ../common/vc_command_util.c - ../common/vc_config_mgr.c + ../common/vc_config_mgr.cpp ../common/vc_config_parser.c ../common/vc_info_parser.c ../common/vc_json_parser.c @@ -49,7 +49,7 @@ SET(MANAGER_SRCS ../common/vc_cmd_db.c ../common/vc_command.c ../common/vc_command_util.c - ../common/vc_config_mgr.c + ../common/vc_config_mgr.cpp ../common/vc_config_parser.c ../common/vc_info_parser.c ../common/vc_json_parser.c diff --git a/common/vc_config_mgr.c b/common/vc_config_mgr.cpp similarity index 98% rename from common/vc_config_mgr.c rename to common/vc_config_mgr.cpp index e77e7f9..8c5f8cc 100644 --- a/common/vc_config_mgr.c +++ b/common/vc_config_mgr.cpp @@ -63,7 +63,7 @@ typedef struct { bool enable; } enabled_cb_parameter_s; -const char* vc_config_tag() +static const char* vc_config_tag() { return TAG_VCCONFIG; } @@ -93,7 +93,7 @@ int __vc_config_mgr_print_client_info(); static gint __compare_uid_in_client_list(gconstpointer a, gconstpointer b) { - const vc_config_client_s *client_info = a; + const vc_config_client_s *client_info = static_cast(a); uintptr_t ptr_uid = (uintptr_t)b; unsigned int uid = ptr_uid; @@ -116,7 +116,7 @@ static vc_config_client_s *__find_client_info(unsigned int uid) vc_config_client_s *result = NULL; if (NULL != target) { - result = target->data; + result = static_cast(target->data); } return result; @@ -124,8 +124,8 @@ static vc_config_client_s *__find_client_info(unsigned int uid) static gint __compare_engine_id_in_engine_list(gconstpointer a, gconstpointer b) { - const vc_engine_info_s *engine_info = a; - const char *engine_id = b; + const vc_engine_info_s *engine_info = static_cast(a); + const char *engine_id = static_cast(b); if (NULL == engine_id) { return 1; @@ -144,7 +144,7 @@ static vc_engine_info_s *__find_engine_info(const char *engine_id) GSList *target = g_slist_find_custom(g_engine_list, engine_id, __compare_engine_id_in_engine_list); vc_engine_info_s *result = NULL; if (NULL != target) { - result = target->data; + result = static_cast(target->data); } return result; @@ -152,8 +152,8 @@ static vc_engine_info_s *__find_engine_info(const char *engine_id) static gint __compare_language_in_languages_of_engine_info(gconstpointer a, gconstpointer b) { - const char *language = a; - const char *target_language = b; + const char *language = static_cast(a); + const char *target_language = static_cast(b); if (NULL == language || NULL == target_language) { return 1; @@ -287,7 +287,7 @@ int __vc_config_mgr_check_engine_is_valid(const char* engine_id) return -1; } - vc_engine_info_s *engine_info = iter->data; + vc_engine_info_s *engine_info = static_cast(iter->data); if (NULL == engine_info) { SLOG(LOG_ERROR, vc_config_tag(), "[ERROR] Engine info is NULL"); return -1; @@ -399,7 +399,7 @@ void __vc_config_release_engine() iter = g_slist_nth(g_engine_list, 0); while (NULL != iter) { - engine_info = iter->data; + engine_info = static_cast(iter->data); if (NULL != engine_info) { g_engine_list = g_slist_remove(g_engine_list, engine_info); @@ -638,7 +638,7 @@ static int __vc_config_mgr_unregister_engine_config_updated_event() iter = g_list_first(g_ino_list); while (NULL != iter) { - vc_engine_inotify_s *tmp = iter->data; + vc_engine_inotify_s *tmp = static_cast(iter->data); if (NULL != tmp) { ecore_main_fd_handler_del(tmp->dir_fd_handler); @@ -1355,7 +1355,7 @@ int vc_config_mgr_get_engine_list(vc_config_supported_engine_cb callback, void* iter = g_slist_nth(g_engine_list, 0); while (NULL != iter) { - engine_info = iter->data; + engine_info = static_cast(iter->data); if (NULL == engine_info) { SLOG(LOG_ERROR, vc_config_tag(), " Engine info is NULL"); @@ -1517,7 +1517,7 @@ int vc_config_mgr_set_engine(const char* engine) return VC_CONFIG_ERROR_OPERATION_FAILED; } - lang = iter_lang->data; + lang = static_cast(iter_lang->data); g_config_info->language = strdup(lang); } @@ -1564,7 +1564,7 @@ int vc_config_mgr_get_language_list(vc_supported_language_cb callback, void* use while (NULL != iter_lang) { /*Get handle data from list*/ - char* lang = iter_lang->data; + char* lang = static_cast(iter_lang->data); SLOG(LOG_INFO, vc_config_tag(), "lang(%s)", lang); if (NULL != lang) { @@ -1828,7 +1828,7 @@ int __vc_config_mgr_print_engine_info() int i = 1; while (NULL != iter) { - engine_info = iter->data; + engine_info = static_cast(iter->data); SLOG(LOG_DEBUG, vc_config_tag(), "[%dth]", i); SLOG(LOG_DEBUG, vc_config_tag(), " name : %s", engine_info->name); @@ -1845,7 +1845,7 @@ int __vc_config_mgr_print_engine_info() int j = 1; while (NULL != iter_lang) { /*Get handle data from list*/ - lang = iter_lang->data; + lang = static_cast(iter_lang->data); SLOG(LOG_DEBUG, vc_config_tag(), " [%dth] %s", j, lang); @@ -1883,7 +1883,7 @@ int __vc_config_mgr_print_client_info() int i = 1; while (NULL != iter) { - temp_client = iter->data; + temp_client = static_cast(iter->data); SLOG(LOG_DEBUG, vc_config_tag(), "[%dth] uid(%u)", i, temp_client->uid); diff --git a/common/vc_config_parser.c b/common/vc_config_parser.c index cf7e088..6fb18d0 100644 --- a/common/vc_config_parser.c +++ b/common/vc_config_parser.c @@ -45,7 +45,10 @@ #define VC_TAG_INFO_FOREGROUND "foreground_pid" -extern char* vc_config_tag(); +static const char* vc_config_tag() +{ + return TAG_VCCONFIG; +} static xmlDocPtr g_config_doc = NULL; diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt index 399781c..39c61dc 100644 --- a/server/CMakeLists.txt +++ b/server/CMakeLists.txt @@ -2,7 +2,7 @@ SET(SRCS ../common/vc_cmd_db.c ../common/vc_command_util.c ../common/vc_command.c - ../common/vc_config_mgr.c + ../common/vc_config_mgr.cpp ../common/vc_config_parser.c ../common/vc_info_parser.c ../common/vc_json_parser.c -- 2.34.1