From 3c819a707659fab46631a4f1780fb593b9c2cc2c Mon Sep 17 00:00:00 2001 From: sooyeon Date: Wed, 6 Jul 2022 13:56:28 +0900 Subject: [PATCH] Replace duplicated codes and Remove unnecessary logs Change-Id: I595a15ba1e9b430e6e6f31ab84a491d60f7fc175 Signed-off-by: sooyeon --- client/vc.c | 575 +++++++++++---------------------------- client/vc_mgr.c | 556 ++++++++----------------------------- client/vc_setting_tidl.c | 14 +- client/vc_tidl.c | 74 ++--- client/vc_widget.c | 294 +++++--------------- common/vc_main.h | 11 +- server/vcd_tidl.c | 76 ++---- 7 files changed, 411 insertions(+), 1189 deletions(-) diff --git a/client/vc.c b/client/vc.c index fecde6a..1b6d87a 100644 --- a/client/vc.c +++ b/client/vc.c @@ -397,7 +397,6 @@ int vc_initialize(void) SLOG(LOG_DEBUG, TAG_VCC, "[Success] pid(%d)", g_vc->handle); - SLOG(LOG_DEBUG, TAG_VCC, "@@@"); return VC_ERROR_NONE; } @@ -690,15 +689,10 @@ int vc_prepare(void) } /* check state */ - if (state != VC_STATE_INITIALIZED) { - SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Invalid State: Current state is not 'CREATED'"); //LCOV_EXCL_LINE - SLOG(LOG_DEBUG, TAG_VCC, "@@@"); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(state != VC_STATE_INITIALIZED, VC_ERROR_INVALID_STATE, TAG_VCC, "[ERROR] Invalid State: Current state(%d) is not 'Initialized'", state); ecore_thread_run(__start_prepare_thread, __end_prepare_thread, NULL, NULL); - SLOG(LOG_DEBUG, TAG_VCC, "@@@"); return VC_ERROR_NONE; } @@ -723,23 +717,14 @@ int vc_prepare_sync(void) } /* check state */ - if (state != VC_STATE_INITIALIZED) { - SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Invalid State: Current state is not 'INITIALIZED'"); - SLOG(LOG_DEBUG, TAG_VCC, "@@@"); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(state != VC_STATE_INITIALIZED, VC_ERROR_INVALID_STATE, TAG_VCC, "[ERROR] Invalid State: Current state(%d) is not 'Initialized'", state); int cnt = 0; while (EINA_TRUE == __vc_connect_daemon(NULL) && VC_CONNECTION_RETRY_COUNT > cnt) { cnt++; } - SLOG(LOG_DEBUG, TAG_VCC, "@@@"); - - if (VC_CONNECTION_RETRY_COUNT == cnt) { - SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Fail to connect daemon"); - return VC_ERROR_OPERATION_FAILED; - } + RETVM_IF(VC_CONNECTION_RETRY_COUNT == cnt, VC_ERROR_OPERATION_FAILED, TAG_VCC, "[ERROR] Fail to connect daemon"); return VC_ERROR_NONE; } @@ -759,23 +744,18 @@ int vc_unprepare(void) vc_state_e state; if (0 != vc_client_get_client_state(g_vc, &state)) { SLOG(LOG_ERROR, TAG_VCC, "[ERROR] A handle is not available"); - SLOG(LOG_DEBUG, TAG_VCC, "@@@"); return VC_ERROR_INVALID_STATE; } /* check state */ - if (state != VC_STATE_READY) { - SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Invalid State: Current state is not 'READY'"); //LCOV_EXCL_LINE - SLOG(LOG_DEBUG, TAG_VCC, "@@@"); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(state != VC_STATE_READY, VC_ERROR_INVALID_STATE, TAG_VCC, "[ERROR] Invalid State: Current state(%d) is not 'READY'", state); __vc_internal_unprepare(); vc_client_set_client_state(g_vc, VC_STATE_INITIALIZED); ecore_main_loop_thread_safe_call_async(__vc_notify_state_changed, (void*)g_vc); - SLOG(LOG_DEBUG, TAG_VCC, "@@@"); + SLOG(LOG_DEBUG, TAG_VCC, "@@@ [Client] Unprepare DONE"); return VC_ERROR_NONE; } @@ -789,13 +769,7 @@ int vc_foreach_supported_languages(vc_supported_language_cb callback, void* user return VC_ERROR_PERMISSION_DENIED; //LCOV_EXCL_LINE } - SLOG(LOG_DEBUG, TAG_VCC, "@@@ [Client] Foreach Supported Language"); - - if (NULL == callback) { - SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Input parameter is NULL"); - SLOG(LOG_DEBUG, TAG_VCC, "@@@"); - return VC_ERROR_INVALID_PARAMETER; - } + RETVM_IF(NULL == callback, VC_ERROR_INVALID_PARAMETER, TAG_VCC, "[ERROR] Input parameter is NULL"); vc_state_e state; if (0 != vc_client_get_client_state(g_vc, &state)) { @@ -804,6 +778,9 @@ int vc_foreach_supported_languages(vc_supported_language_cb callback, void* user return VC_ERROR_INVALID_STATE; } + SLOG(LOG_DEBUG, TAG_VCC, "@@@ [Client] Foreach Supported Language"); + + int ret = -1; ret = vc_config_mgr_get_language_list(callback, user_data); if (0 != ret) { @@ -811,7 +788,7 @@ int vc_foreach_supported_languages(vc_supported_language_cb callback, void* user SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Fail to get languages : %s", __vc_get_error_code(ret)); //LCOV_EXCL_LINE } - SLOG(LOG_DEBUG, TAG_VCC, "@@@"); + SLOG(LOG_DEBUG, TAG_VCC, "@@@ [Client] Foreach Supported Language DONE"); return VC_ERROR_NONE; } @@ -826,13 +803,7 @@ int vc_get_current_language(char** language) return VC_ERROR_PERMISSION_DENIED; //LCOV_EXCL_LINE } - SLOG(LOG_DEBUG, TAG_VCC, "@@@ [Client] Get Current Language"); - - if (NULL == language) { - SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Input parameter is NULL"); - SLOG(LOG_DEBUG, TAG_VCC, "@@@"); - return VC_ERROR_INVALID_PARAMETER; - } + RETVM_IF(NULL == language, VC_ERROR_INVALID_PARAMETER, TAG_VCC, "[ERROR] Input parameter is NULL"); vc_state_e state; if (0 != vc_client_get_client_state(g_vc, &state)) { @@ -841,6 +812,9 @@ int vc_get_current_language(char** language) return VC_ERROR_INVALID_STATE; } + + SLOG(LOG_DEBUG, TAG_VCC, "@@@ [Client] Get Current Language"); + int ret = -1; ret = vc_config_mgr_get_default_language(language); if (0 != ret) { @@ -848,7 +822,7 @@ int vc_get_current_language(char** language) SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Fail to get current languages : %s", __vc_get_error_code(ret)); //LCOV_EXCL_LINE } - SLOG(LOG_DEBUG, TAG_VCC, "@@@"); + SLOG(LOG_DEBUG, TAG_VCC, "@@@ [Client] Get Current Language DONE"); return ret; } @@ -862,12 +836,7 @@ int vc_get_state(vc_state_e* state) return VC_ERROR_PERMISSION_DENIED; //LCOV_EXCL_LINE } - SLOG(LOG_DEBUG, TAG_VCC, "@@@ [Client] Get State"); - - if (NULL == state) { - SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Input parameter is NULL"); - return VC_ERROR_INVALID_PARAMETER; - } + RETVM_IF(NULL == state, VC_ERROR_INVALID_PARAMETER, TAG_VCC, "[ERROR] Input parameter is NULL"); vc_state_e temp; if (0 != vc_client_get_client_state(g_vc, &temp)) { @@ -876,6 +845,9 @@ int vc_get_state(vc_state_e* state) return VC_ERROR_INVALID_STATE; } + + SLOG(LOG_DEBUG, TAG_VCC, "@@@ [Client] Get State"); + *state = temp; switch (*state) { @@ -887,7 +859,7 @@ int vc_get_state(vc_state_e* state) //LCOV_EXCL_STOP } - SLOG(LOG_DEBUG, TAG_VCC, "@@@"); + SLOG(LOG_DEBUG, TAG_VCC, "@@@ [Client] Get State DONE"); return VC_ERROR_NONE; } @@ -901,25 +873,15 @@ int vc_get_service_state(vc_service_state_e* state) return VC_ERROR_PERMISSION_DENIED; //LCOV_EXCL_LINE } - SLOG(LOG_DEBUG, TAG_VCC, "@@@ [Client] Get Service State"); - - if (NULL == state) { - SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Input parameter is NULL"); - return VC_ERROR_INVALID_PARAMETER; - } + RETVM_IF(NULL == state, VC_ERROR_INVALID_PARAMETER, TAG_VCC, "[ERROR] Input parameter is NULL"); vc_state_e temp; if (0 != vc_client_get_client_state(g_vc, &temp)) { SLOG(LOG_ERROR, TAG_VCC, "[ERROR] A handle is not available"); - SLOG(LOG_DEBUG, TAG_VCC, "@@@"); return VC_ERROR_INVALID_STATE; } - if (VC_STATE_READY != temp) { - SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Invalid State: Current state is not 'READY'"); //LCOV_EXCL_LINE - SLOG(LOG_DEBUG, TAG_VCC, "@@@"); //LCOV_EXCL_LINE - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(VC_STATE_READY != temp, VC_ERROR_INVALID_STATE, TAG_VCC, "[ERROR] Invalid State: Current state(%d) is not 'READY'", temp); /* get service state */ vc_service_state_e service_state; @@ -928,6 +890,9 @@ int vc_get_service_state(vc_service_state_e* state) return VC_ERROR_OPERATION_FAILED; } + + SLOG(LOG_DEBUG, TAG_VCC, "@@@ [Client] Get Service State"); + *state = service_state; switch (*state) { @@ -940,7 +905,7 @@ int vc_get_service_state(vc_service_state_e* state) //LCOV_EXCL_STOP } - SLOG(LOG_DEBUG, TAG_VCC, "@@@"); + SLOG(LOG_DEBUG, TAG_VCC, "@@@ [Client] Get Service State DONE"); return VC_ERROR_NONE; } @@ -954,36 +919,25 @@ int vc_get_system_command_list(vc_cmd_list_h* vc_sys_cmd_list) return VC_ERROR_PERMISSION_DENIED; //LCOV_EXCL_LINE } - SLOG(LOG_DEBUG, TAG_VCC, "@@@ [Client] Get system command list"); - - if (NULL == vc_sys_cmd_list) { - SLOG(LOG_ERROR, TAG_VCCMD, "[ERROR] Input parameter is NULL"); - return VC_ERROR_INVALID_PARAMETER; - } + RETVM_IF(NULL == vc_sys_cmd_list, VC_ERROR_INVALID_PARAMETER, TAG_VCC, "[ERROR] Input parameter is NULL"); *vc_sys_cmd_list = NULL; vc_state_e state; if (0 != vc_client_get_client_state(g_vc, &state)) { SLOG(LOG_ERROR, TAG_VCC, "[ERROR] A handle is not available"); - SLOG(LOG_DEBUG, TAG_VCC, "@@@"); return VC_ERROR_INVALID_STATE; } /* check state */ - if (state != VC_STATE_READY) { - SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Invalid State: Current state is not 'READY'"); //LCOV_EXCL_LINE - SLOG(LOG_DEBUG, TAG_VCC, "@@@"); //LCOV_EXCL_LINE - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(state != VC_STATE_READY, VC_ERROR_INVALID_STATE, TAG_VCC, "[ERROR] Invalid State: Current state(%d) is not 'READY'", state); /* Check service state */ vc_service_state_e service_state = -1; vc_client_get_service_state(g_vc, &service_state); - if (service_state != VC_SERVICE_STATE_READY) { - SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Invalid State: service state is not 'READY'"); //LCOV_EXCL_LINE - SLOG(LOG_DEBUG, TAG_VCC, "@@@"); //LCOV_EXCL_LINE - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(service_state != VC_SERVICE_STATE_READY, VC_ERROR_INVALID_STATE, TAG_VCC, "[ERROR] Invalid State: service state(%d) is not 'READY'", service_state); + + + SLOG(LOG_DEBUG, TAG_VCC, "@@@ [Client] Get system command list"); bool is_sys_cmd_valid = false; int count = 0; @@ -1050,7 +1004,7 @@ int vc_get_system_command_list(vc_cmd_list_h* vc_sys_cmd_list) return VC_ERROR_NONE; } - SLOG(LOG_DEBUG, TAG_VCC, "@@@"); + SLOG(LOG_DEBUG, TAG_VCC, "@@@ [Client] Get system command list DONE"); return ret; } @@ -1106,7 +1060,7 @@ int vc_is_command_format_supported(vc_cmd_format_e format, bool* support) SLOG(LOG_ERROR, TAG_VCC, "[DEBUG] Format(%d) support(%s)", format, *support ? "true" : "false"); - SLOG(LOG_DEBUG, TAG_VCC, "@@@"); + SLOG(LOG_DEBUG, TAG_VCC, "@@@ [Client] Is command format supported DONE"); return VC_ERROR_NONE; } @@ -1171,6 +1125,40 @@ static int __vc_get_invocation_name(char** invocation_name) return VC_ERROR_NONE; } +void __set_command(vc_h vc, vc_cmd_type_e type) +{ + int ret = -1; + int count = 0; + bool is_prepared = false; + do { + ret = vc_tidl_request_set_command(vc->handle, type); + if (0 != ret) { + //LCOV_EXCL_START + if (VC_ERROR_INVALID_PARAMETER == ret && false == is_prepared) { + vc_client_set_client_state(vc, VC_STATE_INITIALIZED); + if (0 == vc_prepare_sync()) { + is_prepared = true; + SLOG(LOG_INFO, TAG_VCC, "[INFO] Success vc_prepare_sync"); + } + } else if (VC_ERROR_TIMED_OUT != ret) { + SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Fail to request set command to daemon : %s", __vc_get_error_code(ret)); + break; + } else { + SLOG(LOG_WARN, TAG_VCC, "[WARNING] retry request set command : %s", __vc_get_error_code(ret)); + usleep(10000); + count++; + if (VC_RETRY_COUNT == count) { + SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Fail to request"); + break; + } + } + //LCOV_EXCL_STOP + } + } while (0 != ret); + + return; +} + int vc_set_command_list(vc_cmd_list_h vc_cmd_list, int type) { if (0 != __vc_get_feature_enabled()) { @@ -1180,12 +1168,7 @@ int vc_set_command_list(vc_cmd_list_h vc_cmd_list, int type) return VC_ERROR_PERMISSION_DENIED; //LCOV_EXCL_LINE } - SLOG(LOG_DEBUG, TAG_VCC, "@@@ [Client] Set Command list"); - - if (NULL == vc_cmd_list) { - SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Input parameter is NULL"); - return VC_ERROR_INVALID_PARAMETER; - } + RETVM_IF(NULL == vc_cmd_list, VC_ERROR_INVALID_PARAMETER, TAG_VCC, "[ERROR] Input parameter is NULL"); vc_state_e state; if (0 != vc_client_get_client_state(g_vc, &state)) { @@ -1195,26 +1178,20 @@ int vc_set_command_list(vc_cmd_list_h vc_cmd_list, int type) } /* check state */ - if (state != VC_STATE_READY) { - SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Invalid State: Current state is not 'READY'"); //LCOV_EXCL_LINE - SLOG(LOG_DEBUG, TAG_VCC, "@@@"); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(state != VC_STATE_READY, VC_ERROR_INVALID_STATE, TAG_VCC, "[ERROR] Invalid State: Current state(%d) is not 'READY'", state); + + + SLOG(LOG_DEBUG, TAG_VCC, "@@@ [Client] Set Command list"); /* check type */ if ((VC_COMMAND_TYPE_FOREGROUND != type) && (VC_COMMAND_TYPE_BACKGROUND != type)) { SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Invalid command type: input type is %d", type); //LCOV_EXCL_LINE - SLOG(LOG_DEBUG, TAG_VCC, "@@@"); return VC_ERROR_INVALID_PARAMETER; } vc_cmd_list_s* list = NULL; list = (vc_cmd_list_s*)vc_cmd_list; - - if (NULL == list->list) { - SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Invalid command list"); //LCOV_EXCL_LINE - return VC_ERROR_INVALID_PARAMETER; - } + RETVM_IF(NULL == list->list, VC_ERROR_INVALID_PARAMETER, TAG_VCC, "[ERROR] Invalid command list"); int ret = 0; char* invocation_name = NULL; @@ -1234,33 +1211,7 @@ int vc_set_command_list(vc_cmd_list_h vc_cmd_list, int type) if (0 != ret) { SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Fail to save command list : %s", __vc_get_error_code(ret)); } else { - int count = 0; - bool is_prepared = false; - do { - ret = vc_tidl_request_set_command(g_vc->handle, (vc_cmd_type_e)type); - if (0 != ret) { - //LCOV_EXCL_START - if (VC_ERROR_INVALID_PARAMETER == ret && false == is_prepared) { - vc_client_set_client_state(g_vc, VC_STATE_INITIALIZED); - if (0 == vc_prepare_sync()) { - is_prepared = true; - SLOG(LOG_INFO, TAG_VCC, "[INFO] Success vc_prepare_sync"); - } - } else if (VC_ERROR_TIMED_OUT != ret) { - SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Fail to request set command to daemon : %s", __vc_get_error_code(ret)); - break; - } else { - SLOG(LOG_WARN, TAG_VCC, "[WARNING] retry request set command : %s", __vc_get_error_code(ret)); - usleep(10000); - count++; - if (VC_RETRY_COUNT == count) { - SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Fail to request"); - break; - } - } - //LCOV_EXCL_STOP - } - } while (0 != ret); + __set_command(g_vc, (vc_cmd_type_e)type); } FREE(invocation_name); @@ -1268,7 +1219,7 @@ int vc_set_command_list(vc_cmd_list_h vc_cmd_list, int type) if (VC_COMMAND_TYPE_BACKGROUND == type) g_backup = true; - SLOG(LOG_DEBUG, TAG_VCC, "@@@"); + SLOG(LOG_DEBUG, TAG_VCC, "@@@ [Client] Set Command list DONE"); return ret; } @@ -1282,21 +1233,17 @@ int vc_unset_command_list(int type) return VC_ERROR_PERMISSION_DENIED; //LCOV_EXCL_LINE } - SLOG(LOG_DEBUG, TAG_VCC, "@@@ [Client] Unset Command list"); - vc_state_e state; if (0 != vc_client_get_client_state(g_vc, &state)) { SLOG(LOG_ERROR, TAG_VCC, "[ERROR] A handle is not available"); - SLOG(LOG_DEBUG, TAG_VCC, "@@@"); return VC_ERROR_INVALID_STATE; } /* check state */ - if (state != VC_STATE_READY) { - SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Invalid State: Current state is not 'READY'"); - SLOG(LOG_DEBUG, TAG_VCC, "@@@"); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(state != VC_STATE_READY, VC_ERROR_INVALID_STATE, TAG_VCC, "[ERROR] Invalid State: Current state(%d) is not 'READY'", state); + + + SLOG(LOG_DEBUG, TAG_VCC, "@@@ [Client] Unset Command list"); int count = 0; int ret = -1; @@ -1333,7 +1280,7 @@ int vc_unset_command_list(int type) SLOG(LOG_ERROR, TAG_VCC, "[ERROR] cmd_type(%d), Fail to delete command list : %s", type, __vc_get_error_code(ret)); //LCOV_EXCL_LINE } - SLOG(LOG_DEBUG, TAG_VCC, "@@@"); + SLOG(LOG_DEBUG, TAG_VCC, "@@@ [Client] Unset Command list DONE"); return ret; } @@ -1348,8 +1295,6 @@ int vc_set_command_list_from_file(const char* file_path, int type) return VC_ERROR_PERMISSION_DENIED; //LCOV_EXCL_LINE } - SLOG(LOG_DEBUG, TAG_VCC, "@@@ [Client] Set Command list from file"); - vc_state_e state; if (0 != vc_client_get_client_state(g_vc, &state)) { SLOG(LOG_ERROR, TAG_VCC, "[ERROR] A handle is not available"); @@ -1358,11 +1303,7 @@ int vc_set_command_list_from_file(const char* file_path, int type) } /* check state */ - if (state != VC_STATE_READY) { - SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Invalid State: Current state is not 'READY'"); - SLOG(LOG_DEBUG, TAG_VCC, "@@@"); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(state != VC_STATE_READY, VC_ERROR_INVALID_STATE, TAG_VCC, "[ERROR] Invalid State: Current state(%d) is not 'READY'", state); /* check type */ if ((VC_COMMAND_TYPE_FOREGROUND != type) && (VC_COMMAND_TYPE_BACKGROUND != type)) { @@ -1371,6 +1312,9 @@ int vc_set_command_list_from_file(const char* file_path, int type) return VC_ERROR_INVALID_PARAMETER; } + + SLOG(LOG_DEBUG, TAG_VCC, "@@@ [Client] Set Command list from file"); + int ret = 0; char* invocation_name = NULL; if (VC_COMMAND_TYPE_BACKGROUND == type) { @@ -1389,36 +1333,12 @@ int vc_set_command_list_from_file(const char* file_path, int type) if (0 != ret) { SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Fail to set commands from file : %s", __vc_get_error_code(ret)); } else { - int count = 0; - bool is_prepared = false; - do { - ret = vc_tidl_request_set_command(g_vc->handle, (vc_cmd_type_e)type); - if (0 != ret) { - if (VC_ERROR_INVALID_PARAMETER == ret && false == is_prepared) { - vc_client_set_client_state(g_vc, VC_STATE_INITIALIZED); - if (0 == vc_prepare_sync()) { - is_prepared = true; - SLOG(LOG_INFO, TAG_VCC, "[INFO] Success vc_prepare_sync"); - } - } else if (VC_ERROR_TIMED_OUT != ret) { - SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Fail to request set command to daemon : %s", __vc_get_error_code(ret)); - break; - } else { - SLOG(LOG_WARN, TAG_VCC, "[WARNING] retry request set command : %s", __vc_get_error_code(ret)); - usleep(10000); - count++; - if (VC_RETRY_COUNT == count) { - SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Fail to request"); - break; - } - } - } - } while (0 != ret); + __set_command(g_vc, (vc_cmd_type_e)type); } FREE(invocation_name); - SLOG(LOG_DEBUG, TAG_VCC, "@@@"); + SLOG(LOG_DEBUG, TAG_VCC, "@@@ [Client] Set Command list from file DONE"); return ret; } //LCOV_EXCL_STOP @@ -1792,10 +1712,7 @@ static Eina_Bool __vc_notify_result(void *data) vc_client_get_result_cb(g_vc, &callback, &user_data); - if (NULL == callback) { - SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Client result callback is NULL"); - return EINA_FALSE; - } + RETVM_IF(NULL == callback, EINA_FALSE, TAG_VCC, "[ERROR] Client result callback is NULL"); if (0 != vc_cmd_list_create(&vc_cmd_list)) { SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Fail to create command list"); @@ -1840,8 +1757,6 @@ int vc_get_result(vc_result_cb callback, void* user_data) return VC_ERROR_PERMISSION_DENIED; //LCOV_EXCL_LINE } - SLOG(LOG_DEBUG, TAG_VCC, "@@@ [Client] Get result"); - vc_state_e state; if (0 != vc_client_get_client_state(g_vc, &state)) { SLOG(LOG_ERROR, TAG_VCC, "[ERROR] A handle is not available"); @@ -1850,16 +1765,12 @@ int vc_get_result(vc_result_cb callback, void* user_data) } /* check state */ - if (state != VC_STATE_READY) { - SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Invalid State: Current state is not 'READY'"); //LCOV_EXCL_LINE - SLOG(LOG_DEBUG, TAG_VCC, "@@@"); //LCOV_EXCL_LINE - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(state != VC_STATE_READY, VC_ERROR_INVALID_STATE, TAG_VCC, "[ERROR] Invalid State: Current state(%d) is not 'READY'", state); + + RETVM_IF(NULL == callback, VC_ERROR_INVALID_PARAMETER, TAG_VCC, "[ERROR] Client result callback is NULL"); - if (NULL == callback) { - SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Client result callback is NULL"); //LCOV_EXCL_LINE - return VC_ERROR_INVALID_PARAMETER; - } + + SLOG(LOG_DEBUG, TAG_VCC, "@@@ [Client] Get result"); char* temp_text = NULL; int event = 0; @@ -1890,7 +1801,7 @@ int vc_get_result(vc_result_cb callback, void* user_data) /* Release result */ FREE(temp_text); - SLOG(LOG_DEBUG, TAG_VCC, "@@@"); + SLOG(LOG_DEBUG, TAG_VCC, "@@@ [Client] Get result DONE"); return VC_ERROR_NONE; } @@ -1904,8 +1815,7 @@ int vc_set_result_cb(vc_result_cb callback, void* user_data) return VC_ERROR_PERMISSION_DENIED; //LCOV_EXCL_LINE } - if (NULL == callback) - return VC_ERROR_INVALID_PARAMETER; + RETVM_IF(NULL == callback, VC_ERROR_INVALID_PARAMETER, TAG_VCC, "[ERROR] Client result callback is NULL"); vc_state_e state; if (0 != vc_client_get_client_state(g_vc, &state)) { @@ -1914,10 +1824,7 @@ int vc_set_result_cb(vc_result_cb callback, void* user_data) } /* check state */ - if (state != VC_STATE_INITIALIZED) { - SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Set result callback : Current state is not 'Initialized'"); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(state != VC_STATE_INITIALIZED, VC_ERROR_INVALID_STATE, TAG_VCC, "[ERROR] Invalid State: Current state(%d) is not 'Initialized'", state); vc_client_set_result_cb(g_vc, callback, user_data); @@ -1940,10 +1847,7 @@ int vc_unset_result_cb(void) } /* check state */ - if (state != VC_STATE_INITIALIZED) { - SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Unset result callback : Current state is not 'Initialized'"); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(state != VC_STATE_INITIALIZED, VC_ERROR_INVALID_STATE, TAG_VCC, "[ERROR] Invalid State: Current state(%d) is not 'Initialized'", state); vc_client_set_result_cb(g_vc, NULL, NULL); @@ -2003,8 +1907,7 @@ int vc_set_service_state_changed_cb(vc_service_state_changed_cb callback, void* return VC_ERROR_PERMISSION_DENIED; //LCOV_EXCL_LINE } - if (NULL == callback) - return VC_ERROR_INVALID_PARAMETER; + RETVM_IF(NULL == callback, VC_ERROR_INVALID_PARAMETER, TAG_VCC, "[ERROR] Client service state changed callback is NULL"); vc_state_e state; if (0 != vc_client_get_client_state(g_vc, &state)) { @@ -2013,10 +1916,7 @@ int vc_set_service_state_changed_cb(vc_service_state_changed_cb callback, void* } /* check state */ - if (state != VC_STATE_INITIALIZED) { - SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Set result callback : Current state is not 'Initialized'"); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(state != VC_STATE_INITIALIZED, VC_ERROR_INVALID_STATE, TAG_VCC, "[ERROR] Invalid State: Current state(%d) is not 'Initialized'", state); vc_client_set_service_state_changed_cb(g_vc, callback, user_data); @@ -2039,10 +1939,7 @@ int vc_unset_service_state_changed_cb(void) } /* check state */ - if (state != VC_STATE_INITIALIZED) { - SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Unset result callback : Current state is not 'Initialized'"); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(state != VC_STATE_INITIALIZED, VC_ERROR_INVALID_STATE, TAG_VCC, "[ERROR] Invalid State: Current state(%d) is not 'Initialized'", state); vc_client_set_service_state_changed_cb(g_vc, NULL, NULL); @@ -2058,8 +1955,7 @@ int vc_set_state_changed_cb(vc_state_changed_cb callback, void* user_data) return VC_ERROR_PERMISSION_DENIED; //LCOV_EXCL_LINE } - if (callback == NULL) - return VC_ERROR_INVALID_PARAMETER; + RETVM_IF(NULL == callback, VC_ERROR_INVALID_PARAMETER, TAG_VCC, "[ERROR] Client state changed callback is NULL"); vc_state_e state; if (0 != vc_client_get_client_state(g_vc, &state)) { @@ -2068,10 +1964,7 @@ int vc_set_state_changed_cb(vc_state_changed_cb callback, void* user_data) } /* check state */ - if (state != VC_STATE_INITIALIZED) { - SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Set state changed callback : Current state is not 'Initialized'"); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(state != VC_STATE_INITIALIZED, VC_ERROR_INVALID_STATE, TAG_VCC, "[ERROR] Invalid State: Current state(%d) is not 'Initialized'", state); vc_client_set_state_changed_cb(g_vc, callback, user_data); @@ -2094,10 +1987,7 @@ int vc_unset_state_changed_cb(void) } /* check state */ - if (state != VC_STATE_INITIALIZED) { - SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Unset state changed callback : Current state is not 'Initialized'"); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(state != VC_STATE_INITIALIZED, VC_ERROR_INVALID_STATE, TAG_VCC, "[ERROR] Invalid State: Current state(%d) is not 'Initialized'", state); vc_client_set_state_changed_cb(g_vc, NULL, NULL); @@ -2113,8 +2003,7 @@ int vc_set_current_language_changed_cb(vc_current_language_changed_cb callback, return VC_ERROR_PERMISSION_DENIED; //LCOV_EXCL_LINE } - if (NULL == callback) - return VC_ERROR_INVALID_PARAMETER; + RETVM_IF(NULL == callback, VC_ERROR_INVALID_PARAMETER, TAG_VCC, "[ERROR] Client current language changed callback is NULL"); vc_state_e state; if (0 != vc_client_get_client_state(g_vc, &state)) { @@ -2123,10 +2012,7 @@ int vc_set_current_language_changed_cb(vc_current_language_changed_cb callback, } /* check state */ - if (state != VC_STATE_INITIALIZED) { - SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Set current language changed : Current state is not 'Initialized'"); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(state != VC_STATE_INITIALIZED, VC_ERROR_INVALID_STATE, TAG_VCC, "[ERROR] Invalid State: Current state(%d) is not 'Initialized'", state); vc_client_set_current_lang_changed_cb(g_vc, callback, user_data); @@ -2149,10 +2035,7 @@ int vc_unset_current_language_changed_cb(void) } /* check state */ - if (state != VC_STATE_INITIALIZED) { - SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Unset current language changed : Current state is not 'Initialized'"); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(state != VC_STATE_INITIALIZED, VC_ERROR_INVALID_STATE, TAG_VCC, "[ERROR] Invalid State: Current state(%d) is not 'Initialized'", state); vc_client_set_current_lang_changed_cb(g_vc, NULL, NULL); @@ -2168,8 +2051,7 @@ int vc_set_error_cb(vc_error_cb callback, void* user_data) return VC_ERROR_PERMISSION_DENIED; //LCOV_EXCL_LINE } - if (NULL == callback) - return VC_ERROR_INVALID_PARAMETER; + RETVM_IF(NULL == callback, VC_ERROR_INVALID_PARAMETER, TAG_VCC, "[ERROR] Client error callback is NULL"); vc_state_e state; if (0 != vc_client_get_client_state(g_vc, &state)) { @@ -2178,10 +2060,7 @@ int vc_set_error_cb(vc_error_cb callback, void* user_data) } /* check state */ - if (state != VC_STATE_INITIALIZED) { - SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Set error callback : Current state is not 'Initialized'"); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(state != VC_STATE_INITIALIZED, VC_ERROR_INVALID_STATE, TAG_VCC, "[ERROR] Invalid State: Current state(%d) is not 'Initialized'", state); vc_client_set_error_cb(g_vc, callback, user_data); @@ -2204,10 +2083,7 @@ int vc_unset_error_cb(void) } /* check state */ - if (state != VC_STATE_INITIALIZED) { - SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Unset error callback : Current state is not 'Initialized'"); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(state != VC_STATE_INITIALIZED, VC_ERROR_INVALID_STATE, TAG_VCC, "[ERROR] Invalid State: Current state(%d) is not 'Initialized'", state); vc_client_set_error_cb(g_vc, NULL, NULL); @@ -2234,11 +2110,7 @@ int vc_set_invocation_name(const char* name) } /* check state */ - if (state != VC_STATE_READY) { - SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Invalid State: Current state is not 'READY'"); - SLOG(LOG_DEBUG, TAG_VCC, "@@@"); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(state != VC_STATE_READY, VC_ERROR_INVALID_STATE, TAG_VCC, "[ERROR] Invalid State: Current state(%d) is not 'READY'", state); ret = vc_client_set_invocation_name(g_vc, name); if (0 != ret) { @@ -2253,7 +2125,6 @@ int vc_set_server_dialog(const char* app_id, const char* credential) vc_state_e state; int ret = -1; - SLOG(LOG_DEBUG, TAG_VCC, "@@@ Set server dialog, pid(%d), app_id(%s)", getpid(), app_id); if (0 != __vc_get_feature_enabled()) { return VC_ERROR_NOT_SUPPORTED; //LCOV_EXCL_LINE } @@ -2261,32 +2132,23 @@ int vc_set_server_dialog(const char* app_id, const char* credential) return VC_ERROR_PERMISSION_DENIED; //LCOV_EXCL_LINE } - if (NULL == credential) { - SLOG(LOG_DEBUG, TAG_VCC, "[ERROR] Credential is NULL"); - return VC_ERROR_INVALID_PARAMETER; - } + RETVM_IF(NULL == credential, VC_ERROR_INVALID_PARAMETER, TAG_VCC, "[ERROR] Credential is NULL"); if (0 != vc_client_get_client_state(g_vc, &state)) { SLOG(LOG_ERROR, TAG_VCC, "[ERROR] A handle is not valid"); - SLOG(LOG_DEBUG, TAG_VCC, "@@@"); return VC_ERROR_INVALID_STATE; } /* check state */ - if (state != VC_STATE_READY) { - SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Invalid State: Current state(%d) is not 'READY'", state); - SLOG(LOG_DEBUG, TAG_VCC, "@@@"); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(state != VC_STATE_READY, VC_ERROR_INVALID_STATE, TAG_VCC, "[ERROR] Invalid State: Current state(%d) is not 'READY'", state); /* Check service state */ vc_service_state_e service_state = -1; vc_client_get_service_state(g_vc, &service_state); - if (service_state != VC_SERVICE_STATE_READY) { - SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Invalid State: service state(%d) is not 'READY'", service_state); - SLOG(LOG_DEBUG, TAG_VCC, "@@@"); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(service_state != VC_SERVICE_STATE_READY, VC_ERROR_INVALID_STATE, TAG_VCC, "[ERROR] Invalid State: service state(%d) is not 'READY'", service_state); + + + SLOG(LOG_DEBUG, TAG_VCC, "@@@ Set server dialog, pid(%d), app_id(%s)", getpid(), app_id); char* tmp_appid = NULL; if (NULL == app_id) { @@ -2331,7 +2193,7 @@ int vc_set_server_dialog(const char* app_id, const char* credential) FREE(tmp_appid); - SLOG(LOG_DEBUG, TAG_VCC, "@@@"); + SLOG(LOG_DEBUG, TAG_VCC, "@@@ Set server dialog DONE"); return ret; } @@ -2340,8 +2202,8 @@ int vc_unset_server_dialog(const char* app_id) { vc_state_e state; int ret = -1; + char* tmp_appid = NULL; - SLOG(LOG_DEBUG, TAG_VCC, "@@@ Unset server dialog, pid(%d), app_id(%s)", getpid(), app_id); if (0 != __vc_get_feature_enabled()) { return VC_ERROR_NOT_SUPPORTED; //LCOV_EXCL_LINE } @@ -2351,27 +2213,18 @@ int vc_unset_server_dialog(const char* app_id) if (0 != vc_client_get_client_state(g_vc, &state)) { SLOG(LOG_ERROR, TAG_VCC, "[ERROR] A handle is not valid"); - SLOG(LOG_DEBUG, TAG_VCC, "@@@"); return VC_ERROR_INVALID_STATE; } /* check state */ - if (state != VC_STATE_READY) { - SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Invalid State: Current state(%d) is not 'READY'", state); - SLOG(LOG_DEBUG, TAG_VCC, "@@@"); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(state != VC_STATE_READY, VC_ERROR_INVALID_STATE, TAG_VCC, "[ERROR] Invalid State: Current state(%d) is not 'READY'", state); /* Check service state */ vc_service_state_e service_state = -1; vc_client_get_service_state(g_vc, &service_state); - if (service_state != VC_SERVICE_STATE_READY) { - SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Invalid State: service state(%d) is not 'READY'", service_state); - SLOG(LOG_DEBUG, TAG_VCC, "@@@"); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(service_state != VC_SERVICE_STATE_READY, VC_ERROR_INVALID_STATE, TAG_VCC, "[ERROR] Invalid State: service state(%d) is not 'READY'", service_state); + - char* tmp_appid = NULL; if (NULL == app_id) { ret = app_manager_get_app_id(getpid(), &tmp_appid); if (0 != ret || NULL == tmp_appid) { @@ -2384,7 +2237,7 @@ int vc_unset_server_dialog(const char* app_id) } int pid = getpid(); - SLOG(LOG_DEBUG, TAG_VCC, "Unset server dialog : pid(%d), app_id(%s)", pid, tmp_appid); + SLOG(LOG_DEBUG, TAG_VCC, "@@@ Unset server dialog : pid(%d), app_id(%s)", pid, tmp_appid); int count = 0; bool is_prepared = false; @@ -2416,7 +2269,7 @@ int vc_unset_server_dialog(const char* app_id) FREE(tmp_appid); FREE(credential); - SLOG(LOG_DEBUG, TAG_VCC, "@@@"); + SLOG(LOG_DEBUG, TAG_VCC, "@@@ Unset server dialog DONE"); return ret; } @@ -2426,7 +2279,6 @@ int vc_request_dialog(const char* disp_text, const char* utt_text, bool auto_sta { vc_state_e state; - SLOG(LOG_DEBUG, TAG_VCC, "@@@ Request dialog"); if (0 != __vc_get_feature_enabled()) { return VC_ERROR_NOT_SUPPORTED; //LCOV_EXCL_LINE } @@ -2436,34 +2288,25 @@ int vc_request_dialog(const char* disp_text, const char* utt_text, bool auto_sta if (0 != vc_client_get_client_state(g_vc, &state)) { SLOG(LOG_ERROR, TAG_VCC, "[ERROR] A handle is not valid"); - SLOG(LOG_DEBUG, TAG_VCC, "@@@"); return VC_ERROR_INVALID_STATE; } /* check state */ - if (state != VC_STATE_READY) { - SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Invalid State: Current state is not 'READY'"); //LCOV_EXCL_LINE - SLOG(LOG_DEBUG, TAG_VCC, "@@@"); //LCOV_EXCL_LINE - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(state != VC_STATE_READY, VC_ERROR_INVALID_STATE, TAG_VCC, "[ERROR] Invalid State: Current state(%d) is not 'READY'", state); /* Check service state */ vc_service_state_e service_state = -1; vc_client_get_service_state(g_vc, &service_state); - if (service_state != VC_SERVICE_STATE_READY) { - SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Invalid State: service state is not 'READY'"); //LCOV_EXCL_LINE - SLOG(LOG_DEBUG, TAG_VCC, "@@@"); //LCOV_EXCL_LINE - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(service_state != VC_SERVICE_STATE_READY, VC_ERROR_INVALID_STATE, TAG_VCC, "[ERROR] Invalid State: service state(%d) is not 'READY'", service_state); - SLOG(LOG_DEBUG, TAG_VCC, "Request dialog : pid(%d) disp_text(%s), utt_text(%s), auto_start(%d)", getpid(), disp_text, utt_text, auto_start); + SLOG(LOG_DEBUG, TAG_VCC, "@@@ Request dialog : pid(%d) disp_text(%s), utt_text(%s), auto_start(%d)", getpid(), disp_text, utt_text, auto_start); int ret = vc_tidl_request_request_dialog(getpid(), disp_text, utt_text, auto_start); if (0 != ret) { SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Fail to request dialog, ret(%d)", ret); return VC_ERROR_OPERATION_FAILED; } - SLOG(LOG_DEBUG, TAG_VCC, "@@@"); + SLOG(LOG_DEBUG, TAG_VCC, "@@@ Request dialog DONE"); return VC_ERROR_NONE; } @@ -2478,11 +2321,7 @@ int vc_auth_enable(void) SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Handle is not available"); return VC_ERROR_INVALID_STATE; } - - if (VC_STATE_READY != state) { - SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Current state is not 'READY'"); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(VC_STATE_READY != state, VC_ERROR_INVALID_STATE, TAG_VCC, "[ERROR] Current state(%d) is not 'READY'", state); /* check already authority */ vc_auth_state_e auth_state = VC_AUTH_STATE_NONE; @@ -2490,11 +2329,7 @@ int vc_auth_enable(void) SLOG(LOG_ERROR, TAG_VCC, "[ERROR] handle is not available"); return VC_ERROR_INVALID_STATE; } - - if (VC_AUTH_STATE_NONE != auth_state) { - SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Already authority enabled"); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(VC_AUTH_STATE_NONE != auth_state, VC_ERROR_INVALID_STATE, TAG_VCC, "[ERROR] Already authority enabled"); /* request authority */ int mgr_pid = -1; @@ -2541,11 +2376,7 @@ int vc_auth_disable(void) SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Handle is not available"); return VC_ERROR_INVALID_STATE; } - - if (VC_STATE_READY != state) { - SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Current state is not 'READY'"); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(VC_STATE_READY != state, VC_ERROR_INVALID_STATE, TAG_VCC, "[ERROR] Current state(%d) is not 'READY'", state); /* check authority */ vc_auth_state_e auth_state = VC_AUTH_STATE_NONE; @@ -2553,11 +2384,7 @@ int vc_auth_disable(void) SLOG(LOG_ERROR, TAG_VCC, "[ERROR] handle is not available"); return VC_ERROR_INVALID_STATE; } - - if (VC_AUTH_STATE_NONE == auth_state) { - SLOG(LOG_ERROR, TAG_VCC, "[ERROR] No authority"); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(VC_AUTH_STATE_NONE == auth_state, VC_ERROR_INVALID_STATE, TAG_VCC, "[ERROR] No authority"); if (0 != vc_auth_unset_state_changed_cb()) { SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Fail to unset state changed cb"); @@ -2596,11 +2423,7 @@ int vc_auth_get_state(vc_auth_state_e* state) SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Handle is not available"); return VC_ERROR_INVALID_STATE; } - - if (VC_STATE_READY != vc_state) { - SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Current state is not 'READY'"); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(VC_STATE_READY != vc_state, VC_ERROR_INVALID_STATE, TAG_VCC, "[ERROR] Current state(%d) is not 'READY'", vc_state); /* get authority */ vc_auth_state_e temp = VC_AUTH_STATE_NONE; @@ -2630,11 +2453,7 @@ int vc_auth_set_state_changed_cb(vc_auth_state_changed_cb callback, void* user_d SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Handle is not available"); return VC_ERROR_INVALID_STATE; } - - if (VC_AUTH_STATE_NONE == auth_state) { - SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Auth is not enabled"); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(VC_AUTH_STATE_NONE == auth_state, VC_ERROR_INVALID_STATE, TAG_VCC, "[ERROR] Auth is not enabled"); /* set cb into handle */ if (0 != vc_client_set_auth_state_changed_cb(g_vc, callback, user_data)) { @@ -2655,11 +2474,7 @@ int vc_auth_unset_state_changed_cb(void) SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Handle is not available"); return VC_ERROR_INVALID_STATE; } - - if (VC_AUTH_STATE_NONE == auth_state) { - SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Auto is not enabled"); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(VC_AUTH_STATE_NONE == auth_state, VC_ERROR_INVALID_STATE, TAG_VCC, "[ERROR] Auth is not enabled"); /* unset cb from handle */ if (0 != vc_client_unset_auth_state_changed_cb(g_vc)) { @@ -2684,20 +2499,12 @@ int vc_auth_start(void) } /* check state */ - if (state != VC_STATE_READY) { - SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Invalid State: client state is not 'READY'"); - SLOG(LOG_DEBUG, TAG_VCC, "@@@"); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(state != VC_STATE_READY, VC_ERROR_INVALID_STATE, TAG_VCC, "[ERROR] Invalid State: Current state(%d) is not 'READY'", state); /* Check service state */ vc_service_state_e service_state = -1; vc_client_get_service_state(g_vc, &service_state); - if (service_state != VC_SERVICE_STATE_READY) { - SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Invalid State: service state is not 'READY'"); - SLOG(LOG_DEBUG, TAG_VCC, "@@@"); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(service_state != VC_SERVICE_STATE_READY, VC_ERROR_INVALID_STATE, TAG_VCC, "[ERROR] Invalid State: service state(%d) is not 'READY'", service_state); /* Check authority */ vc_auth_state_e auth_state = VC_AUTH_STATE_NONE; @@ -2705,11 +2512,7 @@ int vc_auth_start(void) SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Fail to get auth state"); return VC_ERROR_OPERATION_FAILED; } - - if (VC_AUTH_STATE_VALID != auth_state) { - SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Not auth valid"); - return VC_ERROR_OPERATION_FAILED; - } + RETVM_IF(VC_AUTH_STATE_VALID != auth_state, VC_ERROR_OPERATION_FAILED, TAG_VCC, "[ERROR] Not auth valid"); /* get mgr_pid */ int mgr_pid = -1; @@ -2765,20 +2568,12 @@ int vc_auth_stop(void) } /* check state */ - if (state != VC_STATE_READY) { - SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Invalid State: client state is not 'Ready'"); - SLOG(LOG_DEBUG, TAG_VCC, "@@@"); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(state != VC_STATE_READY, VC_ERROR_INVALID_STATE, TAG_VCC, "[ERROR] Invalid State: Current state(%d) is not 'READY'", state); /* Check service state */ vc_service_state_e service_state = -1; vc_client_get_service_state(g_vc, &service_state); - if (service_state != VC_SERVICE_STATE_RECORDING) { - SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Invalid State: service state is not 'RECORDING'"); - SLOG(LOG_DEBUG, TAG_VCC, "@@@"); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(service_state != VC_SERVICE_STATE_RECORDING, VC_ERROR_INVALID_STATE, TAG_VCC, "[ERROR] Invalid State: service state(%d) is not 'RECORDING'", service_state); /* Check authority */ vc_auth_state_e auth_state = VC_AUTH_STATE_NONE; @@ -2786,11 +2581,7 @@ int vc_auth_stop(void) SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Fail to get auth state"); return VC_ERROR_OPERATION_FAILED; } - - if (VC_AUTH_STATE_VALID != auth_state) { - SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Not auth valid"); - return VC_ERROR_OPERATION_FAILED; - } + RETVM_IF(VC_AUTH_STATE_VALID != auth_state, VC_ERROR_OPERATION_FAILED, TAG_VCC, "[ERROR] Not auth valid"); /* get mgr_pid */ int mgr_pid = -1; @@ -2846,11 +2637,7 @@ int vc_auth_cancel(void) } /* check state */ - if (state != VC_STATE_READY) { - SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Invalid State: Current state is not 'Ready'"); - SLOG(LOG_DEBUG, TAG_VCC, "@@@"); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(state != VC_STATE_READY, VC_ERROR_INVALID_STATE, TAG_VCC, "[ERROR] Invalid State: Current state(%d) is not 'READY'", state); /* Check service state */ vc_service_state_e service_state = -1; @@ -2867,11 +2654,7 @@ int vc_auth_cancel(void) SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Fail to get auth state"); return VC_ERROR_OPERATION_FAILED; } - - if (VC_AUTH_STATE_VALID != auth_state) { - SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Not auth valid"); - return VC_ERROR_OPERATION_FAILED; - } + RETVM_IF(VC_AUTH_STATE_VALID != auth_state, VC_ERROR_OPERATION_FAILED, TAG_VCC, "[ERROR] Not auth valid"); /* get mgr_pid */ int mgr_pid = -1; @@ -2922,10 +2705,7 @@ static void __start_tts_streaming_thread(void* data, Ecore_Thread* thread) void* user_data = NULL; vc_client_get_tts_streaming_cb(g_vc, &callback, &user_data); - if (NULL == callback) { - SLOG(LOG_WARN, TAG_VCC, "[WARNING] tts streaming callback is null"); - return; - } + RETM_IF(NULL == callback, TAG_VCC, "[WARNING] tts streaming callback is null"); while (1) { int ret = -1; @@ -2987,10 +2767,7 @@ int __vc_cb_tts_streaming(int utt_id, vc_tts_event_e event, char* buffer, int le /* add tts data */ vc_tts_data_s* temp_tts_data = NULL; temp_tts_data = (vc_tts_data_s*)calloc(1, sizeof(vc_tts_data_s)); - if (NULL == temp_tts_data) { - SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Out of memory"); - return VC_ERROR_OUT_OF_MEMORY; - } + RETVM_IF(NULL == temp_tts_data, VC_ERROR_OUT_OF_MEMORY, TAG_VCC, "[ERROR] Out of memory"); temp_tts_data->data = NULL; temp_tts_data->data_size = 0; @@ -3050,20 +2827,12 @@ int vc_tts_request(const char* text, const char* language, bool to_vc_manager, i } /* check state */ - if (state != VC_STATE_READY) { - SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Invalid State: Current state(%d) is not 'READY'", state); - SLOG(LOG_DEBUG, TAG_VCC, "@@@"); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(state != VC_STATE_READY, VC_ERROR_INVALID_STATE, TAG_VCC, "[ERROR] Invalid State: Current state(%d) is not 'READY'", state); /* Check service state */ vc_service_state_e service_state = -1; vc_client_get_service_state(g_vc, &service_state); - if (service_state != VC_SERVICE_STATE_READY) { - SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Invalid State: service state(%d) is not 'READY'", service_state); - SLOG(LOG_DEBUG, TAG_VCC, "@@@"); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(service_state != VC_SERVICE_STATE_READY, VC_ERROR_INVALID_STATE, TAG_VCC, "[ERROR] Invalid State: service state(%d) is not 'READY'", service_state); SLOG(LOG_DEBUG, TAG_VCC, "@@@ tts request, pid(%d), text(%s), language(%s), to_vc_manager(%d)", pid, text, language, to_vc_manager); @@ -3120,20 +2889,12 @@ int vc_tts_cancel(int utt_id) } /* check state */ - if (state != VC_STATE_READY) { - SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Invalid State: Current state(%d) is not 'READY'", state); - SLOG(LOG_DEBUG, TAG_VCC, "@@@"); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(state != VC_STATE_READY, VC_ERROR_INVALID_STATE, TAG_VCC, "[ERROR] Invalid State: Current state(%d) is not 'READY'", state); /* Check service state */ vc_service_state_e service_state = -1; vc_client_get_service_state(g_vc, &service_state); - if (service_state != VC_SERVICE_STATE_READY) { - SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Invalid State: service state(%d) is not 'READY'", service_state); - SLOG(LOG_DEBUG, TAG_VCC, "@@@"); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(service_state != VC_SERVICE_STATE_READY, VC_ERROR_INVALID_STATE, TAG_VCC, "[ERROR] Invalid State: service state(%d) is not 'READY'", service_state); SLOG(LOG_DEBUG, TAG_VCC, "@@@ tts cancel, pid(%d), utt_id(%d)", pid, utt_id); @@ -3195,20 +2956,12 @@ int vc_tts_get_synthesized_audio_details(int* rate, vc_audio_channel_e* channel, } /* check state */ - if (state != VC_STATE_READY) { - SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Invalid State: Current state(%d) is not 'READY'", state); - SLOG(LOG_DEBUG, TAG_VCC, "@@@"); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(state != VC_STATE_READY, VC_ERROR_INVALID_STATE, TAG_VCC, "[ERROR] Invalid State: Current state(%d) is not 'READY'", state); /* Check service state */ vc_service_state_e service_state = -1; vc_client_get_service_state(g_vc, &service_state); - if (service_state != VC_SERVICE_STATE_READY) { - SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Invalid State: service state(%d) is not 'READY'", service_state); - SLOG(LOG_DEBUG, TAG_VCC, "@@@"); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(service_state != VC_SERVICE_STATE_READY, VC_ERROR_INVALID_STATE, TAG_VCC, "[ERROR] Invalid State: service state(%d) is not 'READY'", service_state); SLOG(LOG_DEBUG, TAG_VCC, "@@@ get tts audio format, pid(%d)", pid); @@ -3262,10 +3015,7 @@ int vc_tts_set_streaming_cb(vc_tts_streaming_cb callback, void* user_data) } /* check state */ - if (state != VC_STATE_INITIALIZED) { - SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Set tts streaming callback : Current state(%d) is not 'Initialized'", state); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(state != VC_STATE_INITIALIZED, VC_ERROR_INVALID_STATE, TAG_VCC, "[ERROR] Invalid State: Current state(%d) is not 'Initialized'", state); vc_client_set_tts_streaming_cb(g_vc, callback, user_data); @@ -3288,10 +3038,7 @@ int vc_tts_unset_streaming_cb(void) } /* check state */ - if (state != VC_STATE_INITIALIZED) { - SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Unset tts streaming callback : Current state(%d) is not 'Initialized'", state); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(state != VC_STATE_INITIALIZED, VC_ERROR_INVALID_STATE, TAG_VCC, "[ERROR] Invalid State: Current state(%d) is not 'Initialized'", state); vc_client_set_tts_streaming_cb(g_vc, NULL, NULL); @@ -3304,10 +3051,7 @@ int __vc_cb_utterance_status(int utt_id, int utt_status) void* user_data = NULL; vc_client_get_tts_utterance_status_cb(g_vc, &callback, &user_data); - if (NULL == callback) { - SLOG(LOG_WARN, TAG_VCC, "[WARNING] Utterance status callback is null"); - return VC_ERROR_INVALID_PARAMETER; - } + RETVM_IF(NULL == callback, VC_ERROR_INVALID_PARAMETER, TAG_VCC, "[ERROR] Utterance status callback is null"); SLOG(LOG_DEBUG, TAG_VCC, "Utterance status callback is called"); vc_client_use_callback(g_vc); @@ -3326,8 +3070,7 @@ int vc_tts_set_utterance_status_cb(vc_tts_utterance_status_cb callback, void* us return VC_ERROR_PERMISSION_DENIED; //LCOV_EXCL_LINE } - if (NULL == callback) - return VC_ERROR_INVALID_PARAMETER; + RETVM_IF(NULL == callback, VC_ERROR_INVALID_PARAMETER, TAG_VCC, "[ERROR] Utterance status callback is null"); vc_state_e state; if (0 != vc_client_get_client_state(g_vc, &state)) { @@ -3336,10 +3079,7 @@ int vc_tts_set_utterance_status_cb(vc_tts_utterance_status_cb callback, void* us } /* check state */ - if (state != VC_STATE_INITIALIZED) { - SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Set tts utterance status callback : Current state(%d) is not 'Initialized'", state); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(state != VC_STATE_INITIALIZED, VC_ERROR_INVALID_STATE, TAG_VCC, "[ERROR] Invalid State: Current state(%d) is not 'Initialized'", state); vc_client_set_tts_utterance_status_cb(g_vc, callback, user_data); @@ -3362,10 +3102,7 @@ int vc_tts_unset_utterance_status_cb(void) } /* check state */ - if (state != VC_STATE_INITIALIZED) { - SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Unset tts utterance status callback : Current state(%d) is not 'Initialized'", state); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(state != VC_STATE_INITIALIZED, VC_ERROR_INVALID_STATE, TAG_VCC, "[ERROR] Invalid State: Current state(%d) is not 'Initialized'", state); vc_client_set_tts_utterance_status_cb(g_vc, NULL, NULL); diff --git a/client/vc_mgr.c b/client/vc_mgr.c index 4fe673d..061f0be 100644 --- a/client/vc_mgr.c +++ b/client/vc_mgr.c @@ -583,11 +583,7 @@ int vc_mgr_prepare(void) } /* check state */ - if (state != VC_STATE_INITIALIZED) { - SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Invalid State: Current state is not 'CREATED'"); - SLOG(LOG_DEBUG, TAG_VCM, "@@@"); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(state != VC_STATE_INITIALIZED, VC_ERROR_INVALID_STATE, TAG_VCM, "[ERROR] Invalid State: Current state(%d) is not 'Initialized'", state); if (NULL == g_send_hello_timer) { g_tidl_send_hello_count = 0; @@ -625,11 +621,7 @@ int vc_mgr_unprepare(void) } /* check state */ - if (state != VC_STATE_READY) { - SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Invalid State: Current state is not 'READY'"); - SLOG(LOG_DEBUG, TAG_VCM, "@@@"); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(state != VC_STATE_READY, VC_ERROR_INVALID_STATE, TAG_VCM, "[ERROR] Invalid State: Current state(%d) is not 'Ready'", state); __vc_mgr_internal_unprepare(); @@ -654,11 +646,7 @@ int vc_mgr_foreach_supported_languages(vc_supported_language_cb callback, void* return VC_ERROR_PERMISSION_DENIED; } - if (NULL == callback) { - SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Input parameter is NULL"); - SLOG(LOG_DEBUG, TAG_VCM, "@@@"); - return VC_ERROR_INVALID_PARAMETER; - } + RETVM_IF(NULL == callback, VC_ERROR_INVALID_PARAMETER, TAG_VCM, "[ERROR] Input parameter is NULL"); vc_state_e state; if (0 != vc_mgr_client_get_client_state(g_vc_m, &state)) { @@ -690,10 +678,7 @@ int vc_mgr_get_current_language(char** language) return VC_ERROR_PERMISSION_DENIED; } - if (NULL == language) { - SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Input parameter is NULL"); - return VC_ERROR_INVALID_PARAMETER; - } + RETVM_IF(NULL == language, VC_ERROR_INVALID_PARAMETER, TAG_VCM, "[ERROR] Input parameter is NULL"); vc_state_e state; if (0 != vc_mgr_client_get_client_state(g_vc_m, &state)) { @@ -726,10 +711,7 @@ int vc_mgr_get_state(vc_state_e* state) return VC_ERROR_PERMISSION_DENIED; } - if (NULL == state) { - SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Input parameter is NULL"); - return VC_ERROR_INVALID_PARAMETER; - } + RETVM_IF(NULL == state, VC_ERROR_INVALID_PARAMETER, TAG_VCM, "[ERROR] Input parameter is NULL"); vc_state_e temp; if (NULL == g_vc_m) { @@ -767,10 +749,7 @@ int vc_mgr_get_service_state(vc_service_state_e* state) return VC_ERROR_PERMISSION_DENIED; } - if (NULL == state) { - SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Input parameter is NULL"); - return VC_ERROR_INVALID_PARAMETER; - } + RETVM_IF(NULL == state, VC_ERROR_INVALID_PARAMETER, TAG_VCM, "[ERROR] Input parameter is NULL"); vc_state_e client_state; if (0 != vc_mgr_client_get_client_state(g_vc_m, &client_state)) { @@ -827,11 +806,7 @@ int vc_mgr_set_demandable_client_rule(const char* rule) } /* check state */ - if (state != VC_STATE_READY) { - SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Invalid State: Current state is not 'READY'"); - SLOG(LOG_DEBUG, TAG_VCM, "@@@"); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(state != VC_STATE_READY, VC_ERROR_INVALID_STATE, TAG_VCM, "[ERROR] Invalid State: Current state(%d) is not 'Ready'", state); int ret = -1; ret = vc_info_parser_set_demandable_client(rule); @@ -888,10 +863,7 @@ int vc_mgr_is_command_format_supported(int format, bool* support) return VC_ERROR_PERMISSION_DENIED; } - if (NULL == support) { - SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Invalid parameter, support is NULL ptr"); - return VC_ERROR_INVALID_PARAMETER; - } + RETVM_IF(NULL == support, VC_ERROR_INVALID_PARAMETER, TAG_VCM, "[ERROR] Input parameter is NULL"); vc_state_e state; if (0 != vc_mgr_client_get_client_state(g_vc_m, &state)) { @@ -948,20 +920,12 @@ int vc_mgr_enable_command_type(int cmd_type) } /* check state */ - if (state != VC_STATE_READY) { - SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Invalid State: Current state is not 'READY'"); - SLOG(LOG_DEBUG, TAG_VCM, "@@@"); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(state != VC_STATE_READY, VC_ERROR_INVALID_STATE, TAG_VCM, "[ERROR] Invalid State: Current state(%d) is not 'Ready'", state); /* Check service state */ vc_service_state_e service_state = -1; vc_mgr_client_get_service_state(g_vc_m, &service_state); - if (service_state != VC_SERVICE_STATE_READY) { - SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Invalid State: service state is not 'READY'"); - SLOG(LOG_DEBUG, TAG_VCM, "@@@"); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(service_state != VC_SERVICE_STATE_READY, VC_ERROR_INVALID_STATE, TAG_VCM, "[ERROR] Invalid State: Current service state(%d) is not 'READY'", service_state); int ret; @@ -1003,20 +967,12 @@ int vc_mgr_disable_command_type(int cmd_type) } /* check state */ - if (state != VC_STATE_READY) { - SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Invalid State: Current state is not 'READY'"); - SLOG(LOG_DEBUG, TAG_VCM, "@@@"); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(state != VC_STATE_READY, VC_ERROR_INVALID_STATE, TAG_VCM, "[ERROR] Invalid State: Current state(%d) is not 'Ready'", state); /* Check service state */ vc_service_state_e service_state = -1; vc_mgr_client_get_service_state(g_vc_m, &service_state); - if (service_state != VC_SERVICE_STATE_READY) { - SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Invalid State: service state is not 'READY'"); - SLOG(LOG_DEBUG, TAG_VCM, "@@@"); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(service_state != VC_SERVICE_STATE_READY, VC_ERROR_INVALID_STATE, TAG_VCM, "[ERROR] Invalid State: Current service state(%d) is not 'READY'", service_state); int ret; @@ -1053,34 +1009,20 @@ int vc_mgr_set_command_list(vc_cmd_list_h vc_cmd_list) } /* check state */ - if (state != VC_STATE_READY) { - SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Invalid State: Current state is not 'READY'"); - SLOG(LOG_DEBUG, TAG_VCM, "@@@"); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(state != VC_STATE_READY, VC_ERROR_INVALID_STATE, TAG_VCM, "[ERROR] Invalid State: Current state(%d) is not 'READY'", state); /* Check service state */ vc_service_state_e service_state = -1; vc_mgr_client_get_service_state(g_vc_m, &service_state); - if (service_state != VC_SERVICE_STATE_READY) { - SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Invalid State: service state is not 'READY'"); - SLOG(LOG_DEBUG, TAG_VCM, "@@@"); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(service_state != VC_SERVICE_STATE_READY, VC_ERROR_INVALID_STATE, TAG_VCM, "[ERROR] Invalid State: service state(%d) is not 'READY'", service_state); - if (NULL == vc_cmd_list) { - SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Input parameter is NULL"); - return VC_ERROR_INVALID_PARAMETER; - } + RETVM_IF(NULL == vc_cmd_list, VC_ERROR_INVALID_PARAMETER, TAG_VCM, "[ERROR] Input parameter is NULL"); vc_cmd_list_s* list = NULL; list = (vc_cmd_list_s*)vc_cmd_list; SLOG(LOG_INFO, TAG_VCM, "[List] (%p) (%p)", list, list->list); - if (NULL == list->list) { - SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Invalid command list"); - return VC_ERROR_INVALID_PARAMETER; - } + RETVM_IF(NULL == list->list, VC_ERROR_INVALID_PARAMETER, TAG_VCM, "[ERROR] Input command list"); int i; int ret; @@ -1134,10 +1076,7 @@ int vc_mgr_unset_command_list(void) } /* check state */ - if (state != VC_STATE_READY) { - SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Current state is not 'READY'"); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(state != VC_STATE_READY, VC_ERROR_INVALID_STATE, TAG_VCM, "[ERROR] Invalid State: Current state(%d) is not 'READY'", state); int ret = -1; @@ -1172,12 +1111,8 @@ int vc_mgr_set_command_list_from_file(const char* file_path, int type) return VC_ERROR_PERMISSION_DENIED; } - if (NULL == file_path) { - SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Invalid parameter!!"); - return VC_ERROR_INVALID_PARAMETER; - } else { - SLOG(LOG_INFO, TAG_VCM, "@@@ File path: %s", file_path); - } + RETVM_IF(NULL == file_path, VC_ERROR_INVALID_PARAMETER, TAG_VCM, "[ERROR] Invalid parameter"); + SLOG(LOG_INFO, TAG_VCM, "@@@ File path: %s", file_path); /* check type */ if (VC_COMMAND_TYPE_FOREGROUND > type || VC_COMMAND_TYPE_EXCLUSIVE < type) { @@ -1193,18 +1128,12 @@ int vc_mgr_set_command_list_from_file(const char* file_path, int type) } /* check state */ - if (state != VC_STATE_READY) { - SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Invalid State: Current state is not 'READY'"); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(state != VC_STATE_READY, VC_ERROR_INVALID_STATE, TAG_VCM, "[ERROR] Invalid State: Current state(%d) is not 'READY'", state); /* Check service state */ vc_service_state_e service_state = -1; vc_mgr_client_get_service_state(g_vc_m, &service_state); - if (service_state != VC_SERVICE_STATE_READY) { - SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Invalid State: service state is not 'READY'"); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(service_state != VC_SERVICE_STATE_READY, VC_ERROR_INVALID_STATE, TAG_VCM, "[ERROR] Invalid State: Current service state(%d) is not 'READY'", service_state); int ret = vc_cmd_parser_delete_file(getpid(), type); if (0 != ret) @@ -1238,12 +1167,8 @@ int vc_mgr_set_preloaded_commands_from_file(const char* file_path) return VC_ERROR_PERMISSION_DENIED; } - if (NULL == file_path) { - SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Invalid parameter!! file_path is NULL ptr"); - return VC_ERROR_INVALID_PARAMETER; - } else { - SLOG(LOG_INFO, TAG_VCM, "@@@ File path: %s", file_path); - } + RETVM_IF(NULL == file_path, VC_ERROR_INVALID_PARAMETER, TAG_VCM, "[ERROR] Invalid parameter"); + SLOG(LOG_INFO, TAG_VCM, "@@@ File path: %s", file_path); vc_state_e state; if (0 != vc_mgr_client_get_client_state(g_vc_m, &state)) { @@ -1252,18 +1177,12 @@ int vc_mgr_set_preloaded_commands_from_file(const char* file_path) } /* check state */ - if (state != VC_STATE_READY) { - SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Invalid State: Current state is not 'READY'"); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(state != VC_STATE_READY, VC_ERROR_INVALID_STATE, TAG_VCM, "[ERROR] Invalid State: Current state(%d) is not 'READY'", state); /* Check service state */ vc_service_state_e service_state = -1; vc_mgr_client_get_service_state(g_vc_m, &service_state); - if (service_state != VC_SERVICE_STATE_READY) { - SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Invalid State: service state is not 'READY'"); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(service_state != VC_SERVICE_STATE_READY, VC_ERROR_INVALID_STATE, TAG_VCM, "[ERROR] Invalid State: Current service state(%d) is not 'READY'", service_state); /* Only support to set background commands for preloaded application */ int ret = vc_json_set_commands_from_file(file_path, VC_COMMAND_TYPE_BACKGROUND, NULL); @@ -1300,20 +1219,12 @@ int vc_mgr_set_audio_type(const char* audio_id) } /* check state */ - if (state != VC_STATE_READY) { - SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Invalid State: Current state is not 'READY'"); - SLOG(LOG_DEBUG, TAG_VCM, "@@@"); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(state != VC_STATE_READY, VC_ERROR_INVALID_STATE, TAG_VCM, "[ERROR] Invalid State: Current state(%d) is not 'READY'", state); /* Check service state */ vc_service_state_e service_state = -1; vc_mgr_client_get_service_state(g_vc_m, &service_state); - if (service_state != VC_SERVICE_STATE_READY) { - SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Invalid State: service state is not 'READY'"); - SLOG(LOG_DEBUG, TAG_VCM, "@@@"); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(service_state != VC_SERVICE_STATE_READY, VC_ERROR_INVALID_STATE, TAG_VCM, "[ERROR] Invalid State: Current service state(%d) is not 'READY'", service_state); int ret = -1; /* Request */ @@ -1344,10 +1255,7 @@ int vc_mgr_get_audio_type(char** audio_id) return VC_ERROR_PERMISSION_DENIED; } - if (NULL == audio_id) { - SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Input parameter is NULL"); - return VC_ERROR_INVALID_PARAMETER; - } + RETVM_IF(NULL == audio_id, VC_ERROR_INVALID_PARAMETER, TAG_VCM, "[ERROR] Invalid parameter"); vc_state_e state; if (0 != vc_mgr_client_get_client_state(g_vc_m, &state)) { @@ -1357,20 +1265,12 @@ int vc_mgr_get_audio_type(char** audio_id) } /* check state */ - if (state != VC_STATE_READY) { - SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Invalid State: Current state is not 'READY'"); - SLOG(LOG_DEBUG, TAG_VCM, "@@@"); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(state != VC_STATE_READY, VC_ERROR_INVALID_STATE, TAG_VCM, "[ERROR] Invalid State: Current state(%d) is not 'READY'", state); /* Check service state */ vc_service_state_e service_state = -1; vc_mgr_client_get_service_state(g_vc_m, &service_state); - if (service_state != VC_SERVICE_STATE_READY) { - SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Invalid State: service state is not 'READY'"); - SLOG(LOG_DEBUG, TAG_VCM, "@@@"); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(service_state != VC_SERVICE_STATE_READY, VC_ERROR_INVALID_STATE, TAG_VCM, "[ERROR] Invalid State: Current service state(%d) is not 'READY'", service_state); char* temp = NULL; @@ -1417,31 +1317,18 @@ int vc_mgr_get_current_commands(vc_cmd_list_h* vc_cmd_list) vc_state_e state; if (0 != vc_mgr_client_get_client_state(g_vc_m, &state)) { SLOG(LOG_ERROR, TAG_VCM, "[ERROR] A handle is not available"); - SLOG(LOG_DEBUG, TAG_VCM, "@@@"); return VC_ERROR_INVALID_STATE; } /* check state */ - if (state != VC_STATE_READY) { - SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Invalid State: Current state is not 'READY'"); - SLOG(LOG_DEBUG, TAG_VCM, "@@@"); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(state != VC_STATE_READY, VC_ERROR_INVALID_STATE, TAG_VCM, "[ERROR] Invalid State: Current state(%d) is not 'READY'", state); /* Check service state */ vc_service_state_e service_state = -1; vc_mgr_client_get_service_state(g_vc_m, &service_state); - if (service_state != VC_SERVICE_STATE_READY) { - SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Invalid State: service state is not 'READY'"); - SLOG(LOG_DEBUG, TAG_VCM, "@@@"); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(service_state != VC_SERVICE_STATE_READY, VC_ERROR_INVALID_STATE, TAG_VCM, "[ERROR] Invalid State: service state(%d) is not 'READY'", service_state); - if (NULL == vc_cmd_list) { - SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Invalid Parameter"); - SLOG(LOG_DEBUG, TAG_VCM, "@@@"); - return VC_ERROR_INVALID_PARAMETER; - } + RETVM_IF(NULL == vc_cmd_list, VC_ERROR_INVALID_PARAMETER, TAG_VCM, "[ERROR] Invalid Parameter"); vc_cmd_list_h temp_list = NULL; if (0 != vc_cmd_list_create(&temp_list)) { @@ -1615,20 +1502,12 @@ int vc_mgr_set_recognition_mode(vc_recognition_mode_e mode) } /* check state */ - if (state != VC_STATE_READY) { - SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Invalid State: Current state is not 'READY'"); - SLOG(LOG_DEBUG, TAG_VCM, "@@@"); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(state != VC_STATE_READY, VC_ERROR_INVALID_STATE, TAG_VCM, "[ERROR] Invalid State: Current state(%d) is not 'READY'", state); /* Check service state */ vc_service_state_e service_state = -1; vc_mgr_client_get_service_state(g_vc_m, &service_state); - if (service_state != VC_SERVICE_STATE_READY) { - SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Invalid State: service state is not 'READY'"); - SLOG(LOG_DEBUG, TAG_VCM, "@@@"); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(service_state != VC_SERVICE_STATE_READY, VC_ERROR_INVALID_STATE, TAG_VCM, "[ERROR] Invalid State: Current service state(%d) is not 'READY'", service_state); vc_mgr_client_set_recognition_mode(g_vc_m, mode); return VC_ERROR_NONE; @@ -1647,10 +1526,7 @@ int vc_mgr_get_recognition_mode(vc_recognition_mode_e* mode) int ret = -1; - if (NULL == mode) { - SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Invalid parameter, mode is NULL ptr"); - return VC_ERROR_INVALID_PARAMETER; - } + RETVM_IF(NULL == mode, VC_ERROR_INVALID_PARAMETER, TAG_VCM, "[ERROR] Invalid parameter, mode is NULL ptr"); vc_state_e state; if (0 != vc_mgr_client_get_client_state(g_vc_m, &state)) { @@ -1682,10 +1558,7 @@ int vc_mgr_set_private_data(const char* key, const char* data) return VC_ERROR_PERMISSION_DENIED; } - if (NULL == key) { - SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Invalid parameter"); - return VC_ERROR_INVALID_PARAMETER; - } + RETVM_IF(NULL == key, VC_ERROR_INVALID_PARAMETER, TAG_VCM, "[ERROR] Invalid parameter"); vc_state_e state; if (0 != vc_mgr_client_get_client_state(g_vc_m, &state)) { @@ -1695,20 +1568,12 @@ int vc_mgr_set_private_data(const char* key, const char* data) } /* check state */ - if (state != VC_STATE_READY) { - SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Invalid State: Current state is not 'READY'"); - SLOG(LOG_DEBUG, TAG_VCM, "@@@"); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(state != VC_STATE_READY, VC_ERROR_INVALID_STATE, TAG_VCM, "[ERROR] Invalid State: Current state(%d) is not 'READY'", state); /* Check service state */ vc_service_state_e service_state = -1; vc_mgr_client_get_service_state(g_vc_m, &service_state); - if (service_state != VC_SERVICE_STATE_READY) { - SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Invalid State: service state is not 'READY'"); - SLOG(LOG_DEBUG, TAG_VCM, "@@@"); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(service_state != VC_SERVICE_STATE_READY, VC_ERROR_INVALID_STATE, TAG_VCM, "[ERROR] Invalid State: Current service state(%d) is not 'READY'", service_state); int ret = -1; ret = vc_mgr_tidl_request_set_private_data(g_vc_m->handle, key, data); @@ -1750,20 +1615,12 @@ int vc_mgr_get_private_data(const char* key, char** data) } /* check state */ - if (state != VC_STATE_READY) { - SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Invalid State: Current state is not 'READY'"); - SLOG(LOG_DEBUG, TAG_VCM, "@@@"); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(state != VC_STATE_READY, VC_ERROR_INVALID_STATE, TAG_VCM, "[ERROR] Invalid State: Current state(%d) is not 'READY'", state); /* Check service state */ vc_service_state_e service_state = -1; vc_mgr_client_get_service_state(g_vc_m, &service_state); - if (service_state != VC_SERVICE_STATE_READY) { - SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Invalid State: service state is not 'READY'"); - SLOG(LOG_DEBUG, TAG_VCM, "@@@"); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(service_state != VC_SERVICE_STATE_READY, VC_ERROR_INVALID_STATE, TAG_VCM, "[ERROR] Invalid State: Current service state(%d) is not 'READY'", service_state); int ret = -1; char* temp = NULL; @@ -1802,10 +1659,7 @@ int vc_mgr_set_domain(const char* domain) return VC_ERROR_PERMISSION_DENIED; } - if (NULL == domain) { - SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Invalid parameter"); - return VC_ERROR_INVALID_PARAMETER; - } + RETVM_IF(NULL == domain, VC_ERROR_INVALID_PARAMETER, TAG_VCM, "[ERROR] Invalid parameter"); vc_state_e state; if (0 != vc_mgr_client_get_client_state(g_vc_m, &state)) { @@ -1815,20 +1669,12 @@ int vc_mgr_set_domain(const char* domain) } /* check state */ - if (state != VC_STATE_READY) { - SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Invalid State: Current state is not 'READY'"); - SLOG(LOG_DEBUG, TAG_VCM, "@@@"); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(state != VC_STATE_READY, VC_ERROR_INVALID_STATE, TAG_VCM, "[ERROR] Invalid State: Current state(%d) is not 'READY'", state); /* Check service state */ vc_service_state_e service_state = -1; vc_mgr_client_get_service_state(g_vc_m, &service_state); - if (service_state != VC_SERVICE_STATE_READY) { - SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Invalid State: service state is not 'READY'"); - SLOG(LOG_DEBUG, TAG_VCM, "@@@"); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(service_state != VC_SERVICE_STATE_READY, VC_ERROR_INVALID_STATE, TAG_VCM, "[ERROR] Invalid State: Current service state(%d) is not 'READY'", service_state); int ret = -1; @@ -1862,10 +1708,7 @@ int vc_mgr_do_action(vc_send_event_type_e type, char* send_event) return VC_ERROR_INVALID_PARAMETER; } - if (NULL == send_event) { - SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Invalid parameter"); - return VC_ERROR_INVALID_PARAMETER; - } + RETVM_IF(NULL == send_event, VC_ERROR_INVALID_PARAMETER, TAG_VCM, "[ERROR] Invalid parameter"); vc_state_e state; if (0 != vc_mgr_client_get_client_state(g_vc_m, &state)) { @@ -1875,20 +1718,12 @@ int vc_mgr_do_action(vc_send_event_type_e type, char* send_event) } /* check state */ - if (state != VC_STATE_READY) { - SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Invalid State: Current state is not 'READY'"); - SLOG(LOG_DEBUG, TAG_VCM, "@@@"); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(state != VC_STATE_READY, VC_ERROR_INVALID_STATE, TAG_VCM, "[ERROR] Invalid State: Current state(%d) is not 'READY'", state); /* Check service state */ vc_service_state_e service_state = -1; vc_mgr_client_get_service_state(g_vc_m, &service_state); - if (service_state != VC_SERVICE_STATE_READY) { - SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Invalid State: service state is not 'READY'"); - SLOG(LOG_DEBUG, TAG_VCM, "@@@"); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(service_state != VC_SERVICE_STATE_READY, VC_ERROR_INVALID_STATE, TAG_VCM, "[ERROR] Invalid State: Current service state(%d) is not 'READY'", service_state); int ret = -1; ret = vc_mgr_tidl_request_do_action(g_vc_m->handle, type, send_event); @@ -1935,20 +1770,12 @@ int vc_mgr_send_specific_engine_request(const char* engine_app_id, const char* e } /* check state */ - if (state != VC_STATE_READY) { - SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Invalid State: Current state(%d) is not 'READY'", state); - SLOG(LOG_DEBUG, TAG_VCM, "@@@"); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(state != VC_STATE_READY, VC_ERROR_INVALID_STATE, TAG_VCM, "[ERROR] Invalid State: Current state(%d) is not 'READY'", state); /* Check service state */ vc_service_state_e service_state = -1; vc_mgr_client_get_service_state(g_vc_m, &service_state); - if (service_state != VC_SERVICE_STATE_READY) { - SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Invalid State: service state(%d) is not 'READY'", service_state); - SLOG(LOG_DEBUG, TAG_VCM, "@@@"); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(service_state != VC_SERVICE_STATE_READY, VC_ERROR_INVALID_STATE, TAG_VCM, "[ERROR] Invalid State: Current service state(%d) is not 'READY'", service_state); int ret = -1; ret = vc_mgr_tidl_send_specific_engine_request(g_vc_m->handle, engine_app_id, event, request); @@ -1984,20 +1811,12 @@ int vc_mgr_start(bool exclusive_command_option) } /* check state */ - if (state != VC_STATE_READY) { - SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Invalid State: Current state is not 'READY'"); - SLOG(LOG_DEBUG, TAG_VCM, "@@@"); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(state != VC_STATE_READY, VC_ERROR_INVALID_STATE, TAG_VCM, "[ERROR] Invalid State: Current state(%d) is not 'READY'", state); /* Check service state */ vc_service_state_e service_state = -1; vc_mgr_client_get_service_state(g_vc_m, &service_state); - if (service_state != VC_SERVICE_STATE_READY) { - SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Invalid State: service state is not 'READY'"); - SLOG(LOG_DEBUG, TAG_VCM, "@@@"); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(service_state != VC_SERVICE_STATE_READY, VC_ERROR_INVALID_STATE, TAG_VCM, "[ERROR] Invalid State: Current service state(%d) is not 'READY'", service_state); /* Check internal state for async */ vc_internal_state_e internal_state = -1; @@ -2066,20 +1885,12 @@ int vc_mgr_stop(void) } /* check state */ - if (state != VC_STATE_READY) { - SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Invalid State: client state is not 'READY'"); - SLOG(LOG_DEBUG, TAG_VCM, "@@@"); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(state != VC_STATE_READY, VC_ERROR_INVALID_STATE, TAG_VCM, "[ERROR] Invalid State: Current state(%d) is not 'READY'", state); /* Check service state */ vc_service_state_e service_state = -1; vc_mgr_client_get_service_state(g_vc_m, &service_state); - if (service_state != VC_SERVICE_STATE_RECORDING) { - SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Invalid State: service state is not 'RECORDING'"); - SLOG(LOG_DEBUG, TAG_VCM, "@@@"); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(service_state != VC_SERVICE_STATE_RECORDING, VC_ERROR_INVALID_STATE, TAG_VCM, "[ERROR] Invalid State: Current service state(%d) is not 'RECORDING'", service_state); /* Check internal state for async */ vc_internal_state_e internal_state = -1; @@ -2132,20 +1943,12 @@ int vc_mgr_cancel(void) } /* check state */ - if (state != VC_STATE_READY) { - SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Invalid State: client state is not 'READY'"); - SLOG(LOG_DEBUG, TAG_VCM, "@@@"); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(state != VC_STATE_READY, VC_ERROR_INVALID_STATE, TAG_VCM, "[ERROR] Invalid State: Current state(%d) is not 'READY'", state); /* Check service state */ vc_service_state_e service_state = -1; vc_mgr_client_get_service_state(g_vc_m, &service_state); - if (service_state == VC_SERVICE_STATE_NONE) { - SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Invalid State"); - SLOG(LOG_DEBUG, TAG_VCM, "@@@"); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(service_state == VC_SERVICE_STATE_NONE, VC_ERROR_INVALID_STATE, TAG_VCM, "[ERROR] Invalid State: Current state is NONE"); vc_internal_state_e internal_state = -1; vc_mgr_client_get_internal_state(g_vc_m, &internal_state); @@ -2228,10 +2031,7 @@ int vc_mgr_get_recording_volume(float* volume) return VC_ERROR_PERMISSION_DENIED; } - if (NULL == volume) { - SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Input parameter is NULL"); - return VC_ERROR_INVALID_PARAMETER; - } + RETVM_IF(NULL == volume, VC_ERROR_INVALID_PARAMETER, TAG_VCM, "[ERROR] Invalid parameter"); vc_service_state_e service_state = -1; if (0 != vc_mgr_client_get_service_state(g_vc_m, &service_state)) { @@ -2240,10 +2040,7 @@ int vc_mgr_get_recording_volume(float* volume) } /* check state */ - if (VC_SERVICE_STATE_RECORDING != service_state) { - SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Invalid State: Service state is not 'RECORDING'"); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(VC_SERVICE_STATE_RECORDING != service_state, VC_ERROR_INVALID_STATE, TAG_VCM, "[ERROR] Invalid State: Service state is not 'RECORDING'"); *volume = g_volume_db; @@ -2361,10 +2158,7 @@ static void __vc_mgr_notify_all_result(vc_result_type_e result_type) void* all_user_data = NULL; vc_mgr_client_get_all_result_cb(g_vc_m, &all_callback, &all_user_data); - if (NULL == all_callback) { - SLOG(LOG_ERROR, TAG_VCM, "[ERROR] All result callback is NULL"); - return; - } + RETM_IF(NULL == all_callback, TAG_VCM, "[ERROR] All result callback is NULL"); if (0 != vc_cmd_list_create(&vc_cmd_list)) { SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Fail to create command list"); @@ -2392,10 +2186,7 @@ static void __vc_mgr_notify_all_result(vc_result_type_e result_type) void* user_data = NULL; vc_mgr_client_get_result_cb(g_vc_m, &callback, &user_data); - if (NULL == callback) { - SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Client result callback is NULL"); - return; - } + RETM_IF(NULL == callback, TAG_VCM, "[ERROR] Client result callback is NULL"); vc_mgr_client_use_callback(g_vc_m); callback(event, vc_cmd_list, temp_text, user_data); @@ -2469,10 +2260,7 @@ static Eina_Bool __vc_mgr_notify_result(void *data) void* user_data = NULL; vc_mgr_client_get_result_cb(g_vc_m, &callback, &user_data); - if (NULL == callback) { - SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Client result callback is NULL"); - return EINA_FALSE; - } + RETVM_IF(NULL == callback, EINA_FALSE, TAG_VCM, "[ERROR] Client result callback is NULL"); if (0 != vc_cmd_list_create(&vc_cmd_list)) { SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Fail to create command list"); @@ -2519,10 +2307,7 @@ void __vc_mgr_cb_pre_result(vc_pre_result_event_e event, const char* pre_result) void* user_data = NULL; vc_mgr_client_get_pre_result_cb(g_vc_m, &callback, &user_data); - if (NULL == callback) { - SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Client pre result callback is NULL"); - return; - } + RETM_IF(NULL == callback, TAG_VCM, "[ERROR] Client pre result callback is NULL"); vc_mgr_client_use_callback(g_vc_m); callback(event, pre_result, user_data); @@ -2544,10 +2329,7 @@ static Eina_Bool __vc_mgr_speech_detected(void *data) void* user_data = NULL; vc_mgr_client_get_speech_detected_cb(g_vc_m, &callback, &user_data); - if (NULL == callback) { - SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Client speech detected callback is NULL"); - return EINA_FALSE; - } + RETVM_IF(NULL == callback, EINA_FALSE, TAG_VCM, "[ERROR] Client speech detected callback is NULL"); vc_mgr_client_use_callback(g_vc_m); callback(user_data); @@ -2575,8 +2357,7 @@ int vc_mgr_set_all_result_cb(vc_mgr_all_result_cb callback, void* user_data) return VC_ERROR_PERMISSION_DENIED; } - if (NULL == callback) - return VC_ERROR_INVALID_PARAMETER; + RETVM_IF(NULL == callback, VC_ERROR_INVALID_PARAMETER, TAG_VCM, "[ERROR] Invalid parameter"); vc_state_e state; if (0 != vc_mgr_client_get_client_state(g_vc_m, &state)) { @@ -2585,10 +2366,7 @@ int vc_mgr_set_all_result_cb(vc_mgr_all_result_cb callback, void* user_data) } /* check state */ - if (state != VC_STATE_INITIALIZED) { - SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Set result callback : Current state is not 'Initialized'"); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(state != VC_STATE_INITIALIZED, VC_ERROR_INVALID_STATE, TAG_VCM, "[ERROR] Invalid State: Current state(%d) is not 'Initialized'", state); vc_mgr_client_set_all_result_cb(g_vc_m, callback, user_data); @@ -2615,10 +2393,7 @@ int vc_mgr_unset_all_result_cb(void) } /* check state */ - if (state != VC_STATE_INITIALIZED) { - SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Unset result callback : Current state is not 'Initialized'"); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(state != VC_STATE_INITIALIZED, VC_ERROR_INVALID_STATE, TAG_VCM, "[ERROR] Invalid State: Current state(%d) is not 'Initialized'", state); vc_mgr_client_set_all_result_cb(g_vc_m, NULL, NULL); @@ -2636,8 +2411,7 @@ int vc_mgr_set_result_cb(vc_result_cb callback, void* user_data) return VC_ERROR_PERMISSION_DENIED; } - if (NULL == callback) - return VC_ERROR_INVALID_PARAMETER; + RETVM_IF(NULL == callback, VC_ERROR_INVALID_PARAMETER, TAG_VCM, "[ERROR] Invalid parameter"); vc_state_e state; if (0 != vc_mgr_client_get_client_state(g_vc_m, &state)) { @@ -2646,10 +2420,7 @@ int vc_mgr_set_result_cb(vc_result_cb callback, void* user_data) } /* check state */ - if (state != VC_STATE_INITIALIZED) { - SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Set result callback : Current state is not 'Initialized'"); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(state != VC_STATE_INITIALIZED, VC_ERROR_INVALID_STATE, TAG_VCM, "[ERROR] Invalid State: Current state(%d) is not 'Initialized'", state); vc_mgr_client_set_result_cb(g_vc_m, callback, user_data); @@ -2674,10 +2445,7 @@ int vc_mgr_unset_result_cb(void) } /* check state */ - if (state != VC_STATE_INITIALIZED) { - SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Unset result callback : Current state is not 'Initialized'"); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(state != VC_STATE_INITIALIZED, VC_ERROR_INVALID_STATE, TAG_VCM, "[ERROR] Invalid State: Current state(%d) is not 'Initialized'", state); vc_mgr_client_set_result_cb(g_vc_m, NULL, NULL); @@ -2695,8 +2463,7 @@ int vc_mgr_set_pre_result_cb(vc_mgr_pre_result_cb callback, void* user_data) return VC_ERROR_PERMISSION_DENIED; } - if (NULL == callback) - return VC_ERROR_INVALID_PARAMETER; + RETVM_IF(NULL == callback, VC_ERROR_INVALID_PARAMETER, TAG_VCM, "[ERROR] Invalid parameter"); vc_state_e state; if (0 != vc_mgr_client_get_client_state(g_vc_m, &state)) { @@ -2705,10 +2472,7 @@ int vc_mgr_set_pre_result_cb(vc_mgr_pre_result_cb callback, void* user_data) } /* check state */ - if (state != VC_STATE_INITIALIZED) { - SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Set pre result callback : Current state is not 'Initialized'"); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(state != VC_STATE_INITIALIZED, VC_ERROR_INVALID_STATE, TAG_VCM, "[ERROR] Invalid State: Current state(%d) is not 'Initialized'", state); vc_mgr_client_set_pre_result_cb(g_vc_m, callback, user_data); @@ -2733,10 +2497,7 @@ int vc_mgr_unset_pre_result_cb(void) } /* check state */ - if (state != VC_STATE_INITIALIZED) { - SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Unset pre result callback : Current state is not 'Initialize'"); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(state != VC_STATE_INITIALIZED, VC_ERROR_INVALID_STATE, TAG_VCM, "[ERROR] Invalid State: Current state(%d) is not 'Initialized'", state); vc_mgr_client_set_pre_result_cb(g_vc_m, NULL, NULL); @@ -2763,10 +2524,7 @@ int vc_mgr_get_error_message(char** err_msg) return VC_ERROR_INVALID_STATE; } - if (NULL == err_msg) { - SLOG(LOG_ERROR, TAG_VCM, "[ERROR] invalid parameter"); - return VC_ERROR_INVALID_PARAMETER; - } + RETVM_IF(NULL == err_msg, VC_ERROR_INVALID_PARAMETER, TAG_VCM, "[ERROR] Invalid parameter"); if (false == g_err_callback_status) { SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Not in error callback"); @@ -2895,10 +2653,7 @@ int vc_mgr_set_state_changed_cb(vc_state_changed_cb callback, void* user_data) } /* check state */ - if (state != VC_STATE_INITIALIZED) { - SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Set state changed callback : Current state is not 'Initialized'"); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(state != VC_STATE_INITIALIZED, VC_ERROR_INVALID_STATE, TAG_VCM, "[ERROR] Invalid State: Current state(%d) is not 'Initialized'", state); vc_mgr_client_set_state_changed_cb(g_vc_m, callback, user_data); @@ -2924,10 +2679,7 @@ int vc_mgr_unset_state_changed_cb(void) } /* check state */ - if (state != VC_STATE_INITIALIZED) { - SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Unset state changed callback : Current state is not 'Initialized'"); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(state != VC_STATE_INITIALIZED, VC_ERROR_INVALID_STATE, TAG_VCM, "[ERROR] Invalid State: Current state(%d) is not 'Initialized'", state); vc_mgr_client_set_state_changed_cb(g_vc_m, NULL, NULL); @@ -3002,10 +2754,7 @@ int vc_mgr_set_service_state_changed_cb(vc_service_state_changed_cb callback, vo } /* check state */ - if (state != VC_STATE_INITIALIZED) { - SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Set state changed callback : Current state is not 'Initialized'"); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(state != VC_STATE_INITIALIZED, VC_ERROR_INVALID_STATE, TAG_VCM, "[ERROR] Invalid State: Current state(%d) is not 'Initialized'", state); vc_mgr_client_set_service_state_changed_cb(g_vc_m, callback, user_data); @@ -3031,10 +2780,7 @@ int vc_mgr_unset_service_state_changed_cb(void) } /* check state */ - if (state != VC_STATE_INITIALIZED) { - SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Unset state changed callback : Current state is not 'Initialized'"); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(state != VC_STATE_INITIALIZED, VC_ERROR_INVALID_STATE, TAG_VCM, "[ERROR] Invalid State: Current state(%d) is not 'Initialized'", state); vc_mgr_client_set_service_state_changed_cb(g_vc_m, NULL, NULL); return VC_ERROR_NONE; @@ -3061,10 +2807,7 @@ int vc_mgr_set_speech_detected_cb(vc_mgr_begin_speech_detected_cb callback, void } /* check state */ - if (state != VC_STATE_INITIALIZED) { - SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Set speech detected callback : Current state is not 'Initialized'"); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(state != VC_STATE_INITIALIZED, VC_ERROR_INVALID_STATE, TAG_VCM, "[ERROR] Invalid State: Current state(%d) is not 'Initialized'", state); vc_mgr_client_set_speech_detected_cb(g_vc_m, callback, user_data); @@ -3090,10 +2833,7 @@ int vc_mgr_unset_speech_detected_cb(void) } /* check state */ - if (state != VC_STATE_INITIALIZED) { - SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Unset state changed callback : Current state is not 'Initialized'"); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(state != VC_STATE_INITIALIZED, VC_ERROR_INVALID_STATE, TAG_VCM, "[ERROR] Invalid State: Current state(%d) is not 'Initialized'", state); vc_mgr_client_set_speech_detected_cb(g_vc_m, NULL, NULL); return VC_ERROR_NONE; @@ -3110,8 +2850,7 @@ int vc_mgr_set_current_language_changed_cb(vc_current_language_changed_cb callba return VC_ERROR_PERMISSION_DENIED; } - if (NULL == callback) - return VC_ERROR_INVALID_PARAMETER; + RETVM_IF(NULL == callback, VC_ERROR_INVALID_PARAMETER, TAG_VCM, "[ERROR] Invalid parameter"); vc_state_e state; if (0 != vc_mgr_client_get_client_state(g_vc_m, &state)) { @@ -3120,10 +2859,7 @@ int vc_mgr_set_current_language_changed_cb(vc_current_language_changed_cb callba } /* check state */ - if (state != VC_STATE_INITIALIZED) { - SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Set current language changed : Current state is not 'Initialized'"); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(state != VC_STATE_INITIALIZED, VC_ERROR_INVALID_STATE, TAG_VCM, "[ERROR] Invalid State: Current state(%d) is not 'Initialized'", state); vc_mgr_client_set_current_lang_changed_cb(g_vc_m, callback, user_data); @@ -3149,10 +2885,7 @@ int vc_mgr_unset_current_language_changed_cb(void) } /* check state */ - if (state != VC_STATE_INITIALIZED) { - SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Unset current language changed : Current state is not 'Initialized'"); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(state != VC_STATE_INITIALIZED, VC_ERROR_INVALID_STATE, TAG_VCM, "[ERROR] Invalid State: Current state(%d) is not 'Initialized'", state); vc_mgr_client_set_current_lang_changed_cb(g_vc_m, NULL, NULL); @@ -3170,8 +2903,7 @@ int vc_mgr_set_error_cb(vc_error_cb callback, void* user_data) return VC_ERROR_PERMISSION_DENIED; } - if (NULL == callback) - return VC_ERROR_INVALID_PARAMETER; + RETVM_IF(NULL == callback, VC_ERROR_INVALID_PARAMETER, TAG_VCM, "[ERROR] Invalid parameter"); vc_state_e state; if (0 != vc_mgr_client_get_client_state(g_vc_m, &state)) { @@ -3180,10 +2912,7 @@ int vc_mgr_set_error_cb(vc_error_cb callback, void* user_data) } /* check state */ - if (state != VC_STATE_INITIALIZED) { - SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Set error callback : Current state is not 'Initialized'"); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(state != VC_STATE_INITIALIZED, VC_ERROR_INVALID_STATE, TAG_VCM, "[ERROR] Invalid State: Current state(%d) is not 'Initialized'", state); vc_mgr_client_set_error_cb(g_vc_m, callback, user_data); @@ -3208,10 +2937,7 @@ int vc_mgr_unset_error_cb(void) } /* check state */ - if (state != VC_STATE_INITIALIZED) { - SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Unset error callback : Current state is not 'Initialized'"); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(state != VC_STATE_INITIALIZED, VC_ERROR_INVALID_STATE, TAG_VCM, "[ERROR] Invalid State: Current state(%d) is not 'Initialized'", state); vc_mgr_client_set_error_cb(g_vc_m, NULL, NULL); @@ -3307,10 +3033,7 @@ int __vc_mgr_cb_feedback_streaming(int pid, int utt_id, vc_feedback_event_e even /* add feedback data */ vc_feedback_data_s* temp_feedback_data = NULL; temp_feedback_data = (vc_feedback_data_s*)calloc(1, sizeof(vc_feedback_data_s)); - if (NULL == temp_feedback_data) { - SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Out of memory"); - return VC_ERROR_OUT_OF_MEMORY; - } + RETVM_IF(NULL == temp_feedback_data, VC_ERROR_OUT_OF_MEMORY, TAG_VCM, "[ERROR] Out of memory"); SLOG(LOG_INFO, TAG_VCM, "[INFO] feedback streaming before queing"); temp_feedback_data->data = NULL; @@ -3367,8 +3090,7 @@ int vc_mgr_set_dialog_request_cb(vc_mgr_dialog_request_cb callback, void* user_d return VC_ERROR_PERMISSION_DENIED; } - if (NULL == callback) - return VC_ERROR_INVALID_PARAMETER; + RETVM_IF(NULL == callback, VC_ERROR_INVALID_PARAMETER, TAG_VCM, "[ERROR] Invalid parameter"); vc_state_e state; if (0 != vc_mgr_client_get_client_state(g_vc_m, &state)) { @@ -3377,10 +3099,7 @@ int vc_mgr_set_dialog_request_cb(vc_mgr_dialog_request_cb callback, void* user_d } /* check state */ - if (state != VC_STATE_INITIALIZED) { - SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Set error callback : Current state is not 'Initialized'"); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(state != VC_STATE_INITIALIZED, VC_ERROR_INVALID_STATE, TAG_VCM, "[ERROR] Invalid State: Current state(%d) is not 'Initialized'", state); vc_mgr_client_set_dialog_request_cb(g_vc_m, callback, user_data); @@ -3405,10 +3124,7 @@ int vc_mgr_unset_dialog_request_cb(void) } /* check state */ - if (state != VC_STATE_INITIALIZED) { - SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Unset error callback : Current state is not 'Initialized'"); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(state != VC_STATE_INITIALIZED, VC_ERROR_INVALID_STATE, TAG_VCM, "[ERROR] Invalid State: Current state(%d) is not 'Initialized'", state); vc_mgr_client_set_dialog_request_cb(g_vc_m, NULL, NULL); @@ -3426,8 +3142,7 @@ int vc_mgr_set_private_data_set_cb(vc_mgr_private_data_set_cb callback, void* us return VC_ERROR_PERMISSION_DENIED; } - if (NULL == callback) - return VC_ERROR_INVALID_PARAMETER; + RETVM_IF(NULL == callback, VC_ERROR_INVALID_PARAMETER, TAG_VCM, "[ERROR] Invalid parameter"); vc_state_e state; if (0 != vc_mgr_client_get_client_state(g_vc_m, &state)) { @@ -3436,10 +3151,7 @@ int vc_mgr_set_private_data_set_cb(vc_mgr_private_data_set_cb callback, void* us } /* check state */ - if (VC_STATE_INITIALIZED != state) { - SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Set private data set callback : Current state is not 'Initialized'"); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(VC_STATE_INITIALIZED != state, VC_ERROR_INVALID_STATE, TAG_VCM, "[ERROR] Set private data set callback : Current state is not 'Initialized'"); vc_mgr_client_set_private_data_set_cb(g_vc_m, callback, user_data); @@ -3464,10 +3176,7 @@ int vc_mgr_unset_private_data_set_cb(void) } /* check state */ - if (VC_STATE_INITIALIZED != state) { - SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Unset private data set callback : Current state is not 'Initialized'"); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(VC_STATE_INITIALIZED != state, VC_ERROR_INVALID_STATE, TAG_VCM, "[ERROR] Unset private data set callback : Current state is not 'Initialized'"); vc_mgr_client_set_private_data_set_cb(g_vc_m, NULL, NULL); @@ -3485,8 +3194,7 @@ int vc_mgr_set_private_data_requested_cb(vc_mgr_private_data_requested_cb callba return VC_ERROR_PERMISSION_DENIED; } - if (NULL == callback) - return VC_ERROR_INVALID_PARAMETER; + RETVM_IF(NULL == callback, VC_ERROR_INVALID_PARAMETER, TAG_VCM, "[ERROR] Invalid parameter"); vc_state_e state; if (0 != vc_mgr_client_get_client_state(g_vc_m, &state)) { @@ -3495,10 +3203,7 @@ int vc_mgr_set_private_data_requested_cb(vc_mgr_private_data_requested_cb callba } /* check state*/ - if (VC_STATE_INITIALIZED != state) { - SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Set private data requested callback : Current state is not 'Initialized'"); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(VC_STATE_INITIALIZED != state, VC_ERROR_INVALID_STATE, TAG_VCM, "[ERROR] Set private data requested callback : Current state is not 'Initialized'"); vc_mgr_client_set_private_data_requested_cb(g_vc_m, callback, user_data); @@ -3523,10 +3228,7 @@ int vc_mgr_unset_private_data_requested_cb(void) } /* check state */ - if (VC_STATE_INITIALIZED != state) { - SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Unset private data requested callback : Current state is not 'Initialized'"); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(VC_STATE_INITIALIZED != state, VC_ERROR_INVALID_STATE, TAG_VCM, "[ERROR] Unset private data requested callback : Current state is not 'Initialized'"); vc_mgr_client_set_private_data_requested_cb(g_vc_m, NULL, NULL); @@ -3726,8 +3428,7 @@ int vc_mgr_set_specific_engine_result_cb(vc_mgr_specific_engine_result_cb callba return VC_ERROR_PERMISSION_DENIED; } - if (NULL == callback) - return VC_ERROR_INVALID_PARAMETER; + RETVM_IF(NULL == callback, VC_ERROR_INVALID_PARAMETER, TAG_VCM, "[ERROR] Invalid parameter"); vc_state_e state; if (0 != vc_mgr_client_get_client_state(g_vc_m, &state)) { @@ -3736,10 +3437,7 @@ int vc_mgr_set_specific_engine_result_cb(vc_mgr_specific_engine_result_cb callba } /* check state */ - if (state != VC_STATE_INITIALIZED) { - SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Set specific engine result callback : Current state(%d) is not 'Initialized'", state); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(state != VC_STATE_INITIALIZED, VC_ERROR_INVALID_STATE, TAG_VCM, "[ERROR] Invalid State: Current state(%d) is not 'Initialized'", state); vc_mgr_client_set_specific_engine_result_cb(g_vc_m, callback, user_data); @@ -3758,10 +3456,7 @@ int vc_mgr_unset_specific_engine_result_cb(void) } /* check state */ - if (state != VC_STATE_INITIALIZED) { - SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Unset specific engine result callback : Current state(%d) is not 'Initialize'", state); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(state != VC_STATE_INITIALIZED, VC_ERROR_INVALID_STATE, TAG_VCM, "[ERROR] Invalid State: Current state(%d) is not 'Initialized'", state); vc_mgr_client_set_specific_engine_result_cb(g_vc_m, NULL, NULL); @@ -3774,10 +3469,7 @@ void __vc_mgr_cb_specific_engine_result(const char* engine_app_id, const char* e void* user_data = NULL; vc_mgr_client_get_specific_engine_result_cb(g_vc_m, &callback, &user_data); - if (NULL == callback) { - SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Client specific engine result callback is NULL"); - return; - } + RETM_IF(NULL == callback, TAG_VCM, "[ERROR] Client specific engine result callback is NULL"); vc_mgr_client_use_callback(g_vc_m); callback(engine_app_id, event, result, user_data); @@ -3800,8 +3492,7 @@ int vc_mgr_set_feedback_audio_format_cb(vc_mgr_feedback_audio_format_cb callback return VC_ERROR_PERMISSION_DENIED; } - if (NULL == callback) - return VC_ERROR_INVALID_PARAMETER; + RETVM_IF(NULL == callback, VC_ERROR_INVALID_PARAMETER, TAG_VCM, "[ERROR] Invalid parameter"); vc_state_e state; if (0 != vc_mgr_client_get_client_state(g_vc_m, &state)) { @@ -3810,10 +3501,7 @@ int vc_mgr_set_feedback_audio_format_cb(vc_mgr_feedback_audio_format_cb callback } /* check state */ - if (VC_STATE_INITIALIZED != state) { - SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Set feedback audio format callback : Current state is not 'Initialized' (%d)", state); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(VC_STATE_INITIALIZED != state, VC_ERROR_INVALID_STATE, TAG_VCM, "[ERROR] Set feedback audio format callback : Current state is not 'Initialized'"); vc_mgr_client_set_feedback_audio_format_cb(g_vc_m, callback, user_data); @@ -3841,10 +3529,7 @@ int vc_mgr_unset_feedback_audio_format_cb() } /* check state */ - if (VC_STATE_INITIALIZED != state) { - SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Unset feedback audio format callback : Current state is not 'Initialized' (%d)", state); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(VC_STATE_INITIALIZED != state, VC_ERROR_INVALID_STATE, TAG_VCM, "[ERROR] Unset feedback audio format callback : Current state is not 'Initialized'"); vc_mgr_client_set_feedback_audio_format_cb(g_vc_m, NULL, NULL); @@ -3865,8 +3550,7 @@ int vc_mgr_set_feedback_streaming_cb(vc_mgr_feedback_streaming_cb callback, void return VC_ERROR_PERMISSION_DENIED; } - if (NULL == callback) - return VC_ERROR_INVALID_PARAMETER; + RETVM_IF(NULL == callback, VC_ERROR_INVALID_PARAMETER, TAG_VCM, "[ERROR] Invalid parameter"); pthread_mutex_lock(&g_feedback_streaming_cb_mutex); @@ -3943,8 +3627,7 @@ int vc_mgr_set_vc_tts_streaming_cb(vc_mgr_vc_tts_streaming_cb callback, void* us return VC_ERROR_PERMISSION_DENIED; } - if (NULL == callback) - return VC_ERROR_INVALID_PARAMETER; + RETVM_IF(NULL == callback, VC_ERROR_INVALID_PARAMETER, TAG_VCM, "[ERROR] Invalid parameter"); pthread_mutex_lock(&g_vc_tts_streaming_cb_mutex); @@ -4141,10 +3824,7 @@ int vc_mgr_start_feedback(void) } /* check state */ - if (VC_STATE_READY != state) { - SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Start feedback : Current state is not 'Ready' (%d)", state); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(VC_STATE_READY != state, VC_ERROR_INVALID_STATE, TAG_VCM, "[ERROR] Start feedback : Current state is not 'Ready' (%d)", state); #if 1 bool is_exist = ecore_thread_check(g_feedback_thread); @@ -4184,10 +3864,7 @@ int vc_mgr_stop_feedback(void) } /* check state */ - if (VC_STATE_READY != state) { - SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Stop feedback : Current state is not 'Ready' (%d)", state); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(VC_STATE_READY != state, VC_ERROR_INVALID_STATE, TAG_VCM, "[ERROR] Stop feedback : Current state is not 'Ready' (%d)", state); #if 1 int ret = -1; @@ -4245,20 +3922,12 @@ int vc_mgr_send_utterance_status(int pid, int utt_id, vc_tts_utterance_status_e } /* check state */ - if (state != VC_STATE_READY) { - SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Invalid State: Current state(%d) is not 'READY'", state); - SLOG(LOG_DEBUG, TAG_VCM, "@@@"); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(state != VC_STATE_READY, VC_ERROR_INVALID_STATE, TAG_VCM, "[ERROR] Invalid State: Current state(%d) is not 'Ready'", state); /* Check service state */ vc_service_state_e service_state = -1; vc_mgr_client_get_service_state(g_vc_m, &service_state); - if (service_state != VC_SERVICE_STATE_READY) { - SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Invalid State: service state(%d) is not 'READY'", service_state); - SLOG(LOG_DEBUG, TAG_VCM, "@@@"); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(service_state != VC_SERVICE_STATE_READY, VC_ERROR_INVALID_STATE, TAG_VCM, "[ERROR] Invalid State: Current service state(%d) is not 'READY'", service_state); int ret = vc_mgr_tidl_send_utterance_status(pid, utt_id, utt_status); if (0 != ret) @@ -4320,10 +3989,7 @@ int vc_mgr_send_audio_streaming(vc_audio_streaming_event_e event, unsigned char* return VC_ERROR_INVALID_PARAMETER; } - if (NULL == buffer) { - SLOG(LOG_ERROR, TAG_VCM, "[ERROR] buffer is invalid parameter"); - return VC_ERROR_INVALID_PARAMETER; - } + RETVM_IF(NULL == buffer, VC_ERROR_INVALID_PARAMETER, TAG_VCM, "[ERROR] Invalid parameter"); vc_state_e state = VC_STATE_NONE; int ret = vc_mgr_client_get_client_state(g_vc_m, &state); @@ -4333,11 +3999,7 @@ int vc_mgr_send_audio_streaming(vc_audio_streaming_event_e event, unsigned char* return VC_ERROR_INVALID_STATE; } - if (state != VC_STATE_READY) { - SLOG(LOG_ERROR, TAG_VCM, "[ERROR] Invalid State: Current state is not 'READY'"); - SLOG(LOG_DEBUG, TAG_VCM, "@@@"); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(state != VC_STATE_READY, VC_ERROR_INVALID_STATE, TAG_VCM, "[ERROR] Invalid State: Current state(%d) is not 'Ready'", state); vc_service_state_e service_state = VC_SERVICE_STATE_NONE; ret = vc_mgr_client_get_service_state(g_vc_m, &service_state); diff --git a/client/vc_setting_tidl.c b/client/vc_setting_tidl.c index 42c8017..314daf9 100644 --- a/client/vc_setting_tidl.c +++ b/client/vc_setting_tidl.c @@ -81,7 +81,7 @@ static void __on_connected(rpc_port_proxy_vc_setting_proxy_vc_setting_h h, void* unsigned int pid = (uintptr_t)user_data; vc_setting_tidl_info_s* info = __get_tidl_info_s(pid); - RETM_IF(NULL == info, "[ERROR] Fail to get tidl info"); + RETM_IF(NULL == info, TAG_VCC, "[ERROR] Fail to get tidl info"); info->connected = true; info->connection_requesting = false; @@ -95,7 +95,7 @@ static void __on_disconnected(rpc_port_proxy_vc_setting_proxy_vc_setting_h h, vo unsigned int pid = (uintptr_t)user_data; vc_setting_tidl_info_s* info = __get_tidl_info_s(pid); - RETM_IF(NULL == info, "[ERROR] Fail to get tidl info"); + RETM_IF(NULL == info, TAG_VCC, "[ERROR] Fail to get tidl info"); info->connected = false; info->connection_requesting = false; @@ -110,7 +110,7 @@ static void __on_rejected(rpc_port_proxy_vc_setting_proxy_vc_setting_h h, void* unsigned int pid = (uintptr_t)user_data; vc_setting_tidl_info_s* info = __get_tidl_info_s(pid); - RETM_IF(NULL == info, "[ERROR] Fail to get tidl info"); + RETM_IF(NULL == info, TAG_VCC, "[ERROR] Fail to get tidl info"); info->connection_requesting = false; info->register_notify_callback_invoked = false; @@ -243,7 +243,7 @@ int vc_setting_tidl_close_connection() int pid = getpid(); vc_setting_tidl_info_s* info = __get_tidl_info_s(pid); - RETVM_IF(NULL == info, VC_ERROR_INVALID_PARAMETER, "[ERROR] Fail to get tidl info"); + RETVM_IF(NULL == info, VC_ERROR_INVALID_PARAMETER, TAG_VCC, "[ERROR] Fail to get tidl info"); if (0 != rpc_port_proxy_vc_setting_proxy_vc_setting_destroy(info->rpc_h)) { SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Fail to disconnect"); @@ -265,7 +265,7 @@ int vc_setting_tidl_request_hello() int pid = getpid(); vc_setting_tidl_info_s* info = __get_tidl_info_s(pid); - RETVM_IF(NULL == info, VC_ERROR_INVALID_PARAMETER, "[ERROR] Fail to get tidl info"); + RETVM_IF(NULL == info, VC_ERROR_INVALID_PARAMETER, TAG_VCC, "[ERROR] Fail to get tidl info"); if (!info->connected) { SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Not Connected. Call __request_tidl_connect()"); @@ -298,8 +298,8 @@ int vc_setting_tidl_request_set_language(int pid, const char* language) SLOG(LOG_INFO, TAG_VCC, "[TIDL] vc_setting_tidl_request_set_language"); vc_setting_tidl_info_s* info = __get_tidl_info_s(pid); - RETVM_IF(NULL == info, VC_ERROR_INVALID_PARAMETER, "[ERROR] Fail to get tidl info"); - RETVM_IF(false == info->connected, VC_ERROR_OPERATION_FAILED, "[ERROR] Not Connected"); + RETVM_IF(NULL == info, VC_ERROR_INVALID_PARAMETER, TAG_VCC, "[ERROR] Fail to get tidl info"); + RETVM_IF(false == info->connected, VC_ERROR_OPERATION_FAILED, TAG_VCC, "[ERROR] Not Connected"); int ret = rpc_port_proxy_vc_setting_proxy_vc_setting_invoke_set_language(info->rpc_h, pid, language); if (RPC_PORT_ERROR_NONE != ret) { diff --git a/client/vc_tidl.c b/client/vc_tidl.c index 61ea8ea..33d91a5 100644 --- a/client/vc_tidl.c +++ b/client/vc_tidl.c @@ -90,7 +90,7 @@ static void __on_connected(rpc_port_proxy_vc_proxy_vc_h h, void* user_data) unsigned int pid = (uintptr_t)user_data; vc_tidl_info_s* info = __get_tidl_info_s(pid); - RETM_IF(NULL == info, "[ERROR] Fail to get tidl info"); + RETM_IF(NULL == info, TAG_VCC, "[ERROR] Fail to get tidl info"); info->connected = true; info->connection_requesting = false; @@ -104,7 +104,7 @@ static void __on_disconnected(rpc_port_proxy_vc_proxy_vc_h h, void* user_data) unsigned int pid = (uintptr_t)user_data; vc_tidl_info_s* info = __get_tidl_info_s(pid); - RETM_IF(NULL == info, "[ERROR] Fail to get tidl info"); + RETM_IF(NULL == info, TAG_VCC, "[ERROR] Fail to get tidl info"); info->connected = false; info->connection_requesting = false; @@ -119,7 +119,7 @@ static void __on_rejected(rpc_port_proxy_vc_proxy_vc_h h, void* user_data) unsigned int pid = (uintptr_t)user_data; vc_tidl_info_s* info = __get_tidl_info_s(pid); - RETM_IF(NULL == info, "[ERROR] Fail to get tidl info"); + RETM_IF(NULL == info, TAG_VCC, "[ERROR] Fail to get tidl info"); info->connection_requesting = false; info->register_notify_callback_invoked = false; @@ -378,7 +378,7 @@ int vc_tidl_close_connection() int pid = getpid(); vc_tidl_info_s* info = __get_tidl_info_s(pid); - RETVM_IF(NULL == info, VC_ERROR_INVALID_PARAMETER, "[ERROR] Fail to get tidl info"); + RETVM_IF(NULL == info, VC_ERROR_INVALID_PARAMETER, TAG_VCC, "[ERROR] Fail to get tidl info"); if (0 != rpc_port_proxy_vc_proxy_vc_destroy(info->rpc_h)) { SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Fail to disconnect"); @@ -400,7 +400,7 @@ int vc_tidl_request_hello() int pid = getpid(); vc_tidl_info_s* info = __get_tidl_info_s(pid); - RETVM_IF(NULL == info, VC_ERROR_INVALID_PARAMETER, "[ERROR] Fail to get tidl info"); + RETVM_IF(NULL == info, VC_ERROR_INVALID_PARAMETER, TAG_VCC, "[ERROR] Fail to get tidl info"); if (!info->connected) { SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Not Connected. Call __request_tidl_connect()"); @@ -433,8 +433,8 @@ int vc_tidl_request_initialize(int pid, int* mgr_pid, int* service_state, int* d SLOG(LOG_INFO, TAG_VCC, "[TIDL] vc_tidl_request_initialize"); vc_tidl_info_s* info = __get_tidl_info_s(pid); - RETVM_IF(NULL == info, VC_ERROR_INVALID_PARAMETER, "[ERROR] Fail to get tidl info"); - RETVM_IF(false == info->connected, VC_ERROR_OPERATION_FAILED, "[ERROR] Not Connected"); + RETVM_IF(NULL == info, VC_ERROR_INVALID_PARAMETER, TAG_VCC, "[ERROR] Fail to get tidl info"); + RETVM_IF(false == info->connected, VC_ERROR_OPERATION_FAILED, TAG_VCC, "[ERROR] Not Connected"); int ret = rpc_port_proxy_vc_proxy_vc_invoke_initialize(info->rpc_h, pid, mgr_pid, service_state, daemon_pid); if (RPC_PORT_ERROR_NONE != ret) { @@ -452,8 +452,8 @@ int vc_tidl_request_finalize(int pid) SLOG(LOG_INFO, TAG_VCC, "[TIDL] vc_tidl_request_finalize"); vc_tidl_info_s* info = __get_tidl_info_s(pid); - RETVM_IF(NULL == info, VC_ERROR_INVALID_PARAMETER, "[ERROR] Fail to get tidl info"); - RETVM_IF(false == info->connected, VC_ERROR_OPERATION_FAILED, "[ERROR] Not Connected"); + RETVM_IF(NULL == info, VC_ERROR_INVALID_PARAMETER, TAG_VCC, "[ERROR] Fail to get tidl info"); + RETVM_IF(false == info->connected, VC_ERROR_OPERATION_FAILED, TAG_VCC, "[ERROR] Not Connected"); int ret = rpc_port_proxy_vc_proxy_vc_invoke_finalize(info->rpc_h, pid); if (RPC_PORT_ERROR_NONE != ret) { @@ -471,8 +471,8 @@ int vc_tidl_request_set_command(int pid, vc_cmd_type_e cmd_type) SLOG(LOG_INFO, TAG_VCC, "[TIDL] vc_tidl_request_set_command"); vc_tidl_info_s* info = __get_tidl_info_s(pid); - RETVM_IF(NULL == info, VC_ERROR_INVALID_PARAMETER, "[ERROR] Fail to get tidl info"); - RETVM_IF(false == info->connected, VC_ERROR_OPERATION_FAILED, "[ERROR] Not Connected"); + RETVM_IF(NULL == info, VC_ERROR_INVALID_PARAMETER, TAG_VCC, "[ERROR] Fail to get tidl info"); + RETVM_IF(false == info->connected, VC_ERROR_OPERATION_FAILED, TAG_VCC, "[ERROR] Not Connected"); int ret = rpc_port_proxy_vc_proxy_vc_invoke_set_command(info->rpc_h, pid, cmd_type); if (RPC_PORT_ERROR_NONE != ret) { @@ -490,8 +490,8 @@ int vc_tidl_request_unset_command(int pid, vc_cmd_type_e cmd_type) SLOG(LOG_INFO, TAG_VCC, "[TIDL] vc_tidl_request_unset_command"); vc_tidl_info_s* info = __get_tidl_info_s(pid); - RETVM_IF(NULL == info, VC_ERROR_INVALID_PARAMETER, "[ERROR] Fail to get tidl info"); - RETVM_IF(false == info->connected, VC_ERROR_OPERATION_FAILED, "[ERROR] Not Connected"); + RETVM_IF(NULL == info, VC_ERROR_INVALID_PARAMETER, TAG_VCC, "[ERROR] Fail to get tidl info"); + RETVM_IF(false == info->connected, VC_ERROR_OPERATION_FAILED, TAG_VCC, "[ERROR] Not Connected"); int ret = rpc_port_proxy_vc_proxy_vc_invoke_unset_command(info->rpc_h, pid, cmd_type); if (RPC_PORT_ERROR_NONE != ret) { @@ -510,8 +510,8 @@ int vc_tidl_request_set_foreground(int pid, bool value) SLOG(LOG_INFO, TAG_VCC, "[TIDL] vc_tidl_request_set_foreground"); vc_tidl_info_s* info = __get_tidl_info_s(pid); - RETVM_IF(NULL == info, VC_ERROR_INVALID_PARAMETER, "[ERROR] Fail to get tidl info"); - RETVM_IF(false == info->connected, VC_ERROR_OPERATION_FAILED, "[ERROR] Not Connected"); + RETVM_IF(NULL == info, VC_ERROR_INVALID_PARAMETER, TAG_VCC, "[ERROR] Fail to get tidl info"); + RETVM_IF(false == info->connected, VC_ERROR_OPERATION_FAILED, TAG_VCC, "[ERROR] Not Connected"); int ret = rpc_port_proxy_vc_proxy_vc_invoke_set_foreground(info->rpc_h, pid, value); if (RPC_PORT_ERROR_NONE != ret) { @@ -529,8 +529,8 @@ int vc_tidl_request_set_server_dialog(int pid, const char* app_id, const char* c SLOG(LOG_INFO, TAG_VCC, "[TIDL] vc_tidl_request_set_server_dialog"); vc_tidl_info_s* info = __get_tidl_info_s(pid); - RETVM_IF(NULL == info, VC_ERROR_INVALID_PARAMETER, "[ERROR] Fail to get tidl info"); - RETVM_IF(false == info->connected, VC_ERROR_OPERATION_FAILED, "[ERROR] Not Connected"); + RETVM_IF(NULL == info, VC_ERROR_INVALID_PARAMETER, TAG_VCC, "[ERROR] Fail to get tidl info"); + RETVM_IF(false == info->connected, VC_ERROR_OPERATION_FAILED, TAG_VCC, "[ERROR] Not Connected"); int ret = rpc_port_proxy_vc_proxy_vc_invoke_set_server_dialog(info->rpc_h, pid, app_id, credential); if (RPC_PORT_ERROR_NONE != ret) { @@ -549,8 +549,8 @@ int vc_tidl_request_request_dialog(int pid, const char* disp_text, const char* u SLOG(LOG_INFO, TAG_VCC, "[TIDL] vc_tidl_request_request_dialog"); vc_tidl_info_s* info = __get_tidl_info_s(pid); - RETVM_IF(NULL == info, VC_ERROR_INVALID_PARAMETER, "[ERROR] Fail to get tidl info"); - RETVM_IF(false == info->connected, VC_ERROR_OPERATION_FAILED, "[ERROR] Not Connected"); + RETVM_IF(NULL == info, VC_ERROR_INVALID_PARAMETER, TAG_VCC, "[ERROR] Fail to get tidl info"); + RETVM_IF(false == info->connected, VC_ERROR_OPERATION_FAILED, TAG_VCC, "[ERROR] Not Connected"); int ret = rpc_port_proxy_vc_proxy_vc_invoke_request_dialog(info->rpc_h, pid, disp_text, utt_text, continuous); if (RPC_PORT_ERROR_NONE != ret) { @@ -568,8 +568,8 @@ int vc_tidl_request_is_system_command_valid(int pid, bool* is_sys_cmd_valid) SLOG(LOG_INFO, TAG_VCC, "[TIDL] vc_tidl_request_is_system_command_valid"); vc_tidl_info_s* info = __get_tidl_info_s(pid); - RETVM_IF(NULL == info, VC_ERROR_INVALID_PARAMETER, "[ERROR] Fail to get tidl info"); - RETVM_IF(false == info->connected, VC_ERROR_OPERATION_FAILED, "[ERROR] Not Connected"); + RETVM_IF(NULL == info, VC_ERROR_INVALID_PARAMETER, TAG_VCC, "[ERROR] Fail to get tidl info"); + RETVM_IF(false == info->connected, VC_ERROR_OPERATION_FAILED, TAG_VCC, "[ERROR] Not Connected"); int ret = rpc_port_proxy_vc_proxy_vc_invoke_is_system_command_valid(info->rpc_h, pid, is_sys_cmd_valid); if (RPC_PORT_ERROR_NONE != ret) { @@ -588,8 +588,8 @@ int vc_tidl_request_auth_enable(int pid, int mgr_pid) SLOG(LOG_INFO, TAG_VCC, "[TIDL] vc_tidl_request_auth_enable"); vc_tidl_info_s* info = __get_tidl_info_s(pid); - RETVM_IF(NULL == info, VC_ERROR_INVALID_PARAMETER, "[ERROR] Fail to get tidl info"); - RETVM_IF(false == info->connected, VC_ERROR_OPERATION_FAILED, "[ERROR] Not Connected"); + RETVM_IF(NULL == info, VC_ERROR_INVALID_PARAMETER, TAG_VCC, "[ERROR] Fail to get tidl info"); + RETVM_IF(false == info->connected, VC_ERROR_OPERATION_FAILED, TAG_VCC, "[ERROR] Not Connected"); int ret = rpc_port_proxy_vc_proxy_vc_invoke_auth_enable(info->rpc_h, pid, mgr_pid); if (RPC_PORT_ERROR_NONE != ret) { @@ -607,8 +607,8 @@ int vc_tidl_request_auth_disable(int pid, int mgr_pid) SLOG(LOG_INFO, TAG_VCC, "[TIDL] vc_tidl_request_auth_disable"); vc_tidl_info_s* info = __get_tidl_info_s(pid); - RETVM_IF(NULL == info, VC_ERROR_INVALID_PARAMETER, "[ERROR] Fail to get tidl info"); - RETVM_IF(false == info->connected, VC_ERROR_OPERATION_FAILED, "[ERROR] Not Connected"); + RETVM_IF(NULL == info, VC_ERROR_INVALID_PARAMETER, TAG_VCC, "[ERROR] Fail to get tidl info"); + RETVM_IF(false == info->connected, VC_ERROR_OPERATION_FAILED, TAG_VCC, "[ERROR] Not Connected"); int ret = rpc_port_proxy_vc_proxy_vc_invoke_auth_disable(info->rpc_h, pid, mgr_pid); if (RPC_PORT_ERROR_NONE != ret) { @@ -626,8 +626,8 @@ int vc_tidl_request_auth_start(int pid, int mgr_pid) SLOG(LOG_INFO, TAG_VCC, "[TIDL] vc_tidl_request_auth_start"); vc_tidl_info_s* info = __get_tidl_info_s(pid); - RETVM_IF(NULL == info, VC_ERROR_INVALID_PARAMETER, "[ERROR] Fail to get tidl info"); - RETVM_IF(false == info->connected, VC_ERROR_OPERATION_FAILED, "[ERROR] Not Connected"); + RETVM_IF(NULL == info, VC_ERROR_INVALID_PARAMETER, TAG_VCC, "[ERROR] Fail to get tidl info"); + RETVM_IF(false == info->connected, VC_ERROR_OPERATION_FAILED, TAG_VCC, "[ERROR] Not Connected"); int ret = rpc_port_proxy_vc_proxy_vc_invoke_auth_start(info->rpc_h, pid, mgr_pid); if (RPC_PORT_ERROR_NONE != ret) { @@ -645,8 +645,8 @@ int vc_tidl_request_auth_stop(int pid, int mgr_pid) SLOG(LOG_INFO, TAG_VCC, "[TIDL] vc_tidl_request_auth_stop"); vc_tidl_info_s* info = __get_tidl_info_s(pid); - RETVM_IF(NULL == info, VC_ERROR_INVALID_PARAMETER, "[ERROR] Fail to get tidl info"); - RETVM_IF(false == info->connected, VC_ERROR_OPERATION_FAILED, "[ERROR] Not Connected"); + RETVM_IF(NULL == info, VC_ERROR_INVALID_PARAMETER, TAG_VCC, "[ERROR] Fail to get tidl info"); + RETVM_IF(false == info->connected, VC_ERROR_OPERATION_FAILED, TAG_VCC, "[ERROR] Not Connected"); int ret = rpc_port_proxy_vc_proxy_vc_invoke_auth_stop(info->rpc_h, pid, mgr_pid); if (RPC_PORT_ERROR_NONE != ret) { @@ -664,8 +664,8 @@ int vc_tidl_request_auth_cancel(int pid, int mgr_pid) SLOG(LOG_INFO, TAG_VCC, "[TIDL] vc_tidl_request_auth_cancel"); vc_tidl_info_s* info = __get_tidl_info_s(pid); - RETVM_IF(NULL == info, VC_ERROR_INVALID_PARAMETER, "[ERROR] Fail to get tidl info"); - RETVM_IF(false == info->connected, VC_ERROR_OPERATION_FAILED, "[ERROR] Not Connected"); + RETVM_IF(NULL == info, VC_ERROR_INVALID_PARAMETER, TAG_VCC, "[ERROR] Fail to get tidl info"); + RETVM_IF(false == info->connected, VC_ERROR_OPERATION_FAILED, TAG_VCC, "[ERROR] Not Connected"); int ret = rpc_port_proxy_vc_proxy_vc_invoke_auth_cancel(info->rpc_h, pid, mgr_pid); if (RPC_PORT_ERROR_NONE != ret) { @@ -684,8 +684,8 @@ int vc_tidl_request_request_tts(int pid, const char* text, const char* language, SLOG(LOG_INFO, TAG_VCC, "[TIDL] vc_tidl_request_request_tts"); vc_tidl_info_s* info = __get_tidl_info_s(pid); - RETVM_IF(NULL == info, VC_ERROR_INVALID_PARAMETER, "[ERROR] Fail to get tidl info"); - RETVM_IF(false == info->connected, VC_ERROR_OPERATION_FAILED, "[ERROR] Not Connected"); + RETVM_IF(NULL == info, VC_ERROR_INVALID_PARAMETER, TAG_VCC, "[ERROR] Fail to get tidl info"); + RETVM_IF(false == info->connected, VC_ERROR_OPERATION_FAILED, TAG_VCC, "[ERROR] Not Connected"); if (VC_ERROR_NONE != __invoke_register_feedback_callback(pid, info)) { SLOG(LOG_ERROR, TAG_VCC, "[ERROR] Fail to invoke register feedback callback"); @@ -708,8 +708,8 @@ int vc_tidl_request_cancel_tts(int pid, int utt_id) SLOG(LOG_INFO, TAG_VCC, "[TIDL] vc_tidl_request_cancel_tts"); vc_tidl_info_s* info = __get_tidl_info_s(pid); - RETVM_IF(NULL == info, VC_ERROR_INVALID_PARAMETER, "[ERROR] Fail to get tidl info"); - RETVM_IF(false == info->connected, VC_ERROR_OPERATION_FAILED, "[ERROR] Not Connected"); + RETVM_IF(NULL == info, VC_ERROR_INVALID_PARAMETER, TAG_VCC, "[ERROR] Fail to get tidl info"); + RETVM_IF(false == info->connected, VC_ERROR_OPERATION_FAILED, TAG_VCC, "[ERROR] Not Connected"); int ret = rpc_port_proxy_vc_proxy_vc_invoke_cancel_tts(info->rpc_h, pid, utt_id); if (RPC_PORT_ERROR_NONE != ret) { @@ -727,8 +727,8 @@ int vc_tidl_request_get_tts_audio_format(int pid, int* rate, vc_audio_channel_e* SLOG(LOG_INFO, TAG_VCC, "[TIDL] vc_tidl_request_get_tts_audio_format"); vc_tidl_info_s* info = __get_tidl_info_s(pid); - RETVM_IF(NULL == info, VC_ERROR_INVALID_PARAMETER, "[ERROR] Fail to get tidl info"); - RETVM_IF(false == info->connected, VC_ERROR_OPERATION_FAILED, "[ERROR] Not Connected"); + RETVM_IF(NULL == info, VC_ERROR_INVALID_PARAMETER, TAG_VCC, "[ERROR] Fail to get tidl info"); + RETVM_IF(false == info->connected, VC_ERROR_OPERATION_FAILED, TAG_VCC, "[ERROR] Not Connected"); int ret = rpc_port_proxy_vc_proxy_vc_invoke_get_tts_audio_format(info->rpc_h, pid, rate, (int*)channel, (int*)audio_type); if (RPC_PORT_ERROR_NONE != ret) { diff --git a/client/vc_widget.c b/client/vc_widget.c index 5161784..d4816f0 100644 --- a/client/vc_widget.c +++ b/client/vc_widget.c @@ -168,10 +168,7 @@ int vc_widget_initialize(vc_h* vc_w) return VC_ERROR_NONE; } - if (NULL == vc_w) { - SLOG(LOG_ERROR, TAG_VCW, "[ERROR] Input parameter is NULL"); - return VC_ERROR_INVALID_PARAMETER; - } + RETVM_IF(NULL == vc_w, VC_ERROR_INVALID_PARAMETER, TAG_VCW, "[ERROR] Input parameter is NULL"); if (0 == vc_widget_client_get_count()) { if (0 != vc_widget_tidl_open_connection()) { @@ -208,7 +205,7 @@ int vc_widget_initialize(vc_h* vc_w) SLOG(LOG_DEBUG, TAG_VCW, "[Success] uid(%d)", (*vc_w)->handle); - SLOG(LOG_DEBUG, TAG_VCW, "@@@"); + SLOG(LOG_DEBUG, TAG_VCW, "@@@ [Widget] Initialize DONE"); pthread_mutex_unlock(&g_w_init_mutex); return VC_ERROR_NONE; @@ -285,7 +282,6 @@ int vc_widget_deinitialize(vc_h vc_w) pthread_mutex_lock(&g_w_init_mutex); if (false == vc_widget_client_is_valid(vc_w)) { SLOG(LOG_ERROR, TAG_VCW, "[ERROR] NOT initialized"); - SLOG(LOG_DEBUG, TAG_VCW, "@@@"); pthread_mutex_unlock(&g_w_init_mutex); return VC_ERROR_INVALID_STATE; } @@ -338,7 +334,7 @@ int vc_widget_deinitialize(vc_h vc_w) } } - SLOG(LOG_DEBUG, TAG_VCW, "@@@"); + SLOG(LOG_DEBUG, TAG_VCW, "@@@ [Widget] Deinitialize DONE"); pthread_mutex_unlock(&g_w_init_mutex); return VC_ERROR_NONE; @@ -365,8 +361,7 @@ static Eina_Bool __focus_changed_cb(void *data, int type, void *event) SLOG(LOG_DEBUG, TAG_VCW, "@@@ type(%d) is NOT valid", type); } - SLOG(LOG_DEBUG, TAG_VCW, "@@@"); - SLOG(LOG_DEBUG, TAG_VCW, ""); + SLOG(LOG_DEBUG, TAG_VCW, "@@@ Focus changed DONE"); return ECORE_CALLBACK_RENEW; } @@ -570,7 +565,7 @@ static void __start_prepare_thread(void *data, Ecore_Thread *thread) } g_w_prepare_thread = NULL; - SLOG(LOG_DEBUG, TAG_VCW, "@@@"); + SLOG(LOG_DEBUG, TAG_VCW, "@@@ Start prepare thread DONE"); return; } @@ -597,7 +592,6 @@ int vc_widget_prepare(vc_h vc_w) vc_state_e state; if (0 != vc_widget_client_get_state(vc_w, &state)) { SLOG(LOG_ERROR, TAG_VCW, "[ERROR] A handle is not available"); - SLOG(LOG_DEBUG, TAG_VCW, "@@@"); pthread_mutex_unlock(&g_w_init_mutex); return VC_ERROR_INVALID_STATE; } @@ -605,7 +599,6 @@ int vc_widget_prepare(vc_h vc_w) /* check state */ if (state != VC_STATE_INITIALIZED) { SLOG(LOG_ERROR, TAG_VCW, "[ERROR] Invalid State: Current state is not 'Initialized'"); - SLOG(LOG_DEBUG, TAG_VCW, "@@@"); pthread_mutex_unlock(&g_w_init_mutex); return VC_ERROR_INVALID_STATE; } @@ -613,7 +606,6 @@ int vc_widget_prepare(vc_h vc_w) vc_widget_s* widget = widget_get(vc_w); if (NULL == widget) { SLOG(LOG_ERROR, TAG_VCW, "[ERROR] Fail to get widget handle"); - SLOG(LOG_DEBUG, TAG_VCW, "@@@"); pthread_mutex_unlock(&g_w_init_mutex); return VC_ERROR_INVALID_STATE; } @@ -630,7 +622,7 @@ int vc_widget_prepare(vc_h vc_w) g_ask_to_cancel_preparing = false; g_w_prepare_thread = ecore_thread_run(__start_prepare_thread, __end_prepare_thread, __cancel_prepare_thread, (void*)vc_w); - SLOG(LOG_DEBUG, TAG_VCW, "@@@"); + SLOG(LOG_DEBUG, TAG_VCW, "@@@ [Widget] Prepare DONE"); pthread_mutex_unlock(&g_w_init_mutex); return VC_ERROR_NONE; } @@ -655,7 +647,6 @@ int vc_widget_unprepare(vc_h vc_w) vc_state_e state; if (0 != vc_widget_client_get_state(vc_w, &state)) { SLOG(LOG_ERROR, TAG_VCW, "[ERROR] A handle is not available"); - SLOG(LOG_DEBUG, TAG_VCW, "@@@"); pthread_mutex_unlock(&g_w_init_mutex); return VC_ERROR_INVALID_STATE; } @@ -663,7 +654,6 @@ int vc_widget_unprepare(vc_h vc_w) /* check state */ if (state != VC_STATE_READY) { SLOG(LOG_ERROR, TAG_VCW, "[ERROR] Invalid State: Current state is not 'READY', state(%d)", state); - SLOG(LOG_DEBUG, TAG_VCW, "@@@"); pthread_mutex_unlock(&g_w_init_mutex); return VC_ERROR_INVALID_STATE; } @@ -673,7 +663,7 @@ int vc_widget_unprepare(vc_h vc_w) vc_widget_client_set_state(vc_w, VC_STATE_INITIALIZED); g_w_notify_state_timer = ecore_timer_add(0, __vc_widget_notify_state_changed, vc_w); - SLOG(LOG_DEBUG, TAG_VCW, "@@@"); + SLOG(LOG_DEBUG, TAG_VCW, "@@@ [Widget] Unprepare DONE"); pthread_mutex_unlock(&g_w_init_mutex); return VC_ERROR_NONE; } @@ -690,16 +680,11 @@ int vc_widget_enable_asr_result(vc_h vc_w, bool enable) vc_state_e state; if (0 != vc_widget_client_get_state(vc_w, &state)) { SLOG(LOG_ERROR, TAG_VCW, "[ERROR] A handle is not available"); - SLOG(LOG_DEBUG, TAG_VCW, "@@@"); return VC_ERROR_INVALID_STATE; } /* check state */ - if (state != VC_STATE_READY) { - SLOG(LOG_ERROR, TAG_VCW, "[ERROR] Invalid State: Current state is not 'READY'"); - SLOG(LOG_DEBUG, TAG_VCW, "@@@"); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(state != VC_STATE_READY, VC_ERROR_INVALID_STATE, TAG_VCW, "[ERROR] Invalid State: Current state is not 'READY'"); int ret = -1; @@ -711,7 +696,7 @@ int vc_widget_enable_asr_result(vc_h vc_w, bool enable) vc_widget_client_set_asr_result_enabled(vc_w, enable); - SLOG(LOG_DEBUG, TAG_VCW, "@@@"); + SLOG(LOG_DEBUG, TAG_VCW, "@@@ [Widget] Enable asr result DONE"); return ret; } @@ -725,16 +710,11 @@ int vc_widget_foreach_supported_languages(vc_h vc_w, vc_supported_language_cb ca return VC_ERROR_NONE; } - if (NULL == callback) { - SLOG(LOG_ERROR, TAG_VCW, "[ERROR] Input parameter is NULL"); - SLOG(LOG_DEBUG, TAG_VCW, "@@@"); - return VC_ERROR_INVALID_PARAMETER; - } + RETVM_IF(NULL == callback, VC_ERROR_INVALID_PARAMETER, TAG_VCW, "[ERROR] Input parameter is NULL"); vc_state_e state; if (0 != vc_widget_client_get_state(vc_w, &state)) { SLOG(LOG_ERROR, TAG_VCW, "[ERROR] A handle is not available"); - SLOG(LOG_DEBUG, TAG_VCW, "@@@"); return VC_ERROR_INVALID_STATE; } @@ -745,7 +725,7 @@ int vc_widget_foreach_supported_languages(vc_h vc_w, vc_supported_language_cb ca SLOG(LOG_ERROR, TAG_VCW, "[ERROR] Fail to get languages : %s", __vc_widget_get_error_code(ret)); } - SLOG(LOG_DEBUG, TAG_VCW, "@@@"); + SLOG(LOG_DEBUG, TAG_VCW, "@@@ [Widget] Foreach Supported Language DONE"); return VC_ERROR_NONE; } @@ -759,16 +739,11 @@ int vc_widget_get_current_language(vc_h vc_w, char** language) return VC_ERROR_NONE; } - if (NULL == language) { - SLOG(LOG_ERROR, TAG_VCW, "[ERROR] Input parameter is NULL"); - SLOG(LOG_DEBUG, TAG_VCW, "@@@"); - return VC_ERROR_INVALID_PARAMETER; - } + RETVM_IF(NULL == language, VC_ERROR_INVALID_PARAMETER, TAG_VCW, "[ERROR] Input parameter is NULL"); vc_state_e state; if (0 != vc_widget_client_get_state(vc_w, &state)) { SLOG(LOG_ERROR, TAG_VCW, "[ERROR] A handle is not available"); - SLOG(LOG_DEBUG, TAG_VCW, "@@@"); return VC_ERROR_INVALID_STATE; } @@ -779,7 +754,7 @@ int vc_widget_get_current_language(vc_h vc_w, char** language) SLOG(LOG_ERROR, TAG_VCW, "[ERROR] Fail to get current languages : %s", __vc_widget_get_error_code(ret)); } - SLOG(LOG_DEBUG, TAG_VCW, "@@@"); + SLOG(LOG_DEBUG, TAG_VCW, "@@@ [Widget] Get Current Language DONE"); return ret; } @@ -793,15 +768,11 @@ int vc_widget_get_state(vc_h vc_w, vc_state_e* state) return VC_ERROR_NONE; } - if (NULL == state) { - SLOG(LOG_ERROR, TAG_VCW, "[ERROR] Input parameter is NULL"); - return VC_ERROR_INVALID_PARAMETER; - } + RETVM_IF(NULL == state, VC_ERROR_INVALID_PARAMETER, TAG_VCW, "[ERROR] Input parameter is NULL"); vc_state_e temp; if (0 != vc_widget_client_get_state(vc_w, &temp)) { SLOG(LOG_DEBUG, TAG_VCW, "[ERROR] A handle is not available"); - SLOG(LOG_DEBUG, TAG_VCW, "@@@"); return VC_ERROR_INVALID_STATE; } @@ -814,7 +785,7 @@ int vc_widget_get_state(vc_h vc_w, vc_state_e* state) default: SLOG(LOG_ERROR, TAG_VCW, "Invalid state"); } - SLOG(LOG_DEBUG, TAG_VCW, "@@@"); + SLOG(LOG_DEBUG, TAG_VCW, "@@@ [Widget] Get State DONE"); return VC_ERROR_NONE; } @@ -828,23 +799,15 @@ int vc_widget_get_service_state(vc_h vc_w, vc_service_state_e* state) return VC_ERROR_NONE; } - if (NULL == state) { - SLOG(LOG_ERROR, TAG_VCW, "[ERROR] Input parameter is NULL"); - return VC_ERROR_INVALID_PARAMETER; - } + RETVM_IF(NULL == state, VC_ERROR_INVALID_PARAMETER, TAG_VCW, "[ERROR] Input parameter is NULL"); vc_state_e temp; if (0 != vc_widget_client_get_state(vc_w, &temp)) { SLOG(LOG_ERROR, TAG_VCW, "[ERROR] A handle is not available"); - SLOG(LOG_DEBUG, TAG_VCW, "@@@"); return VC_ERROR_INVALID_STATE; } - if (temp != VC_STATE_READY) { - SLOG(LOG_ERROR, TAG_VCW, "[ERROR] Invalid State: Current state is not 'READY'"); - SLOG(LOG_DEBUG, TAG_VCW, "@@@"); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(temp != VC_STATE_READY, VC_ERROR_INVALID_STATE, TAG_VCW, "[ERROR] Invalid State: Current state is not 'READY'"); /* get service state */ vc_service_state_e service_state; @@ -863,7 +826,7 @@ int vc_widget_get_service_state(vc_h vc_w, vc_service_state_e* state) default: SLOG(LOG_ERROR, TAG_VCW, "Invalid service state"); } - SLOG(LOG_DEBUG, TAG_VCW, "@@@"); + SLOG(LOG_DEBUG, TAG_VCW, "@@@ [Widget] Get Service State DONE"); return VC_ERROR_NONE; } @@ -880,16 +843,11 @@ int vc_widget_set_foreground(vc_h vc_w, bool value) vc_state_e state; if (0 != vc_widget_client_get_state(vc_w, &state)) { SLOG(LOG_ERROR, TAG_VCW, "[ERROR] A handle is not valid"); - SLOG(LOG_DEBUG, TAG_VCW, "@@@"); return VC_ERROR_INVALID_STATE; } /* check state */ - if (state != VC_STATE_READY) { - SLOG(LOG_ERROR, TAG_VCW, "[ERROR] Invalid State: Current state is not 'READY'"); - SLOG(LOG_DEBUG, TAG_VCW, "@@@"); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(state != VC_STATE_READY, VC_ERROR_INVALID_STATE, TAG_VCW, "[ERROR] Invalid State: Current state is not 'READY'"); SLOG(LOG_DEBUG, TAG_VCW, "Set foreground : pid(%d) value(%s)", getpid(), value ? "true" : "false"); int ret = vc_widget_tidl_set_foreground(getpid(), value); @@ -898,7 +856,7 @@ int vc_widget_set_foreground(vc_h vc_w, bool value) SLOG(LOG_ERROR, TAG_VCW, "[ERROR] Fail to set foreground : %s", __vc_widget_get_error_code(ret)); } - SLOG(LOG_DEBUG, TAG_VCW, "@@@"); + SLOG(LOG_DEBUG, TAG_VCW, "@@@ [Widget] Set foreground state DONE"); return VC_ERROR_NONE; } @@ -910,7 +868,6 @@ int vc_widget_is_format_supported(vc_h vc_w, vc_cmd_format_e format, bool* suppo vc_state_e state; if (0 != vc_widget_client_get_state(vc_w, &state)) { SLOG(LOG_ERROR, TAG_VCW, "[ERROR] A handle is not valid"); - SLOG(LOG_DEBUG, TAG_VCW, "@@@"); return VC_ERROR_INVALID_STATE; } @@ -931,7 +888,7 @@ int vc_widget_is_format_supported(vc_h vc_w, vc_cmd_format_e format, bool* suppo SLOG(LOG_ERROR, TAG_VCW, "[DEBUG] Format(%d) support(%s)", format, *support ? "true" : "false"); - SLOG(LOG_DEBUG, TAG_VCW, "@@@"); + SLOG(LOG_DEBUG, TAG_VCW, "@@@ [Widget] Is command type supported DONE"); return VC_ERROR_NONE; } @@ -1117,23 +1074,17 @@ int vc_widget_cancel(vc_h vc_w) vc_state_e state; if (0 != vc_widget_client_get_state(vc_w, &state)) { SLOG(LOG_ERROR, TAG_VCW, "[ERROR] A handle is not available"); - SLOG(LOG_DEBUG, TAG_VCW, "@@@"); return VC_ERROR_INVALID_STATE; } /* check state */ - if (state != VC_STATE_READY) { - SLOG(LOG_ERROR, TAG_VCW, "[ERROR] Invalid State: Current state is not 'READY'"); - SLOG(LOG_DEBUG, TAG_VCW, "@@@"); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(state != VC_STATE_READY, VC_ERROR_INVALID_STATE, TAG_VCW, "[ERROR] Invalid State: Current state is not 'READY'"); /* Check service state */ vc_service_state_e service_state = -1; vc_widget_client_get_service_state(vc_w, &service_state); if (service_state != VC_SERVICE_STATE_RECORDING && service_state != VC_SERVICE_STATE_PROCESSING) { SLOG(LOG_ERROR, TAG_VCW, "[ERROR] Invalid State: service state is not 'RECORDING' or 'PROCESSING'"); - SLOG(LOG_DEBUG, TAG_VCW, "@@@"); return VC_ERROR_INVALID_STATE; } @@ -1144,7 +1095,7 @@ int vc_widget_cancel(vc_h vc_w) SLOG(LOG_ERROR, TAG_VCW, "[ERROR] Fail to request cancel : %s", __vc_widget_get_error_code(ret)); } - SLOG(LOG_DEBUG, TAG_VCW, "@@@"); + SLOG(LOG_DEBUG, TAG_VCW, "@@@ [Widget] Cancel Recognition DONE"); // TODO: check return value correct or not return VC_ERROR_NONE; @@ -1156,10 +1107,8 @@ static void __vc_widget_notify_error(void *data) vc_error_cb callback = NULL; void* user_data; int reason; - if (NULL == vc_w) { - SLOG(LOG_ERROR, TAG_VCW, "[ERROR] Input parameter is NULL"); - return; - } + + RETM_IF(NULL == vc_w, TAG_VCW, "[ERROR] Input parameter is NULL"); vc_widget_client_get_error_cb(vc_w, &callback, &user_data); vc_widget_client_get_error(vc_w, &reason); @@ -1198,10 +1147,7 @@ int __vc_widget_cb_error(int reason, int daemon_pid, char* msg) } /* check state */ - if (state != VC_STATE_READY) { - SLOG(LOG_ERROR, TAG_VCW, "[WARNING] not connected client yet"); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(state != VC_STATE_READY, VC_ERROR_INVALID_STATE, TAG_VCW, "[ERROR] not connected client yet"); if (VC_ERROR_SERVICE_RESET == reason) { SLOG(LOG_ERROR, TAG_VCW, "[ERROR] VC daemon reset"); @@ -1369,10 +1315,7 @@ static Eina_Bool __vc_widget_notify_result(void *data) if (NULL != widget_data) { vc_w = widget_data->vc; vc_widget_client_get_result_cb(vc_w, &callback, &user_data); - if (NULL == callback) { - SLOG(LOG_ERROR, TAG_VCW, "[ERROR] Client result callback is NULL"); - return EINA_FALSE; - } + RETVM_IF(NULL == callback, EINA_FALSE, TAG_VCW, "[ERROR] Client result callback is NULL"); vc_cmd_print_list(vc_cmd_list); @@ -1446,10 +1389,7 @@ bool __vc_widget_cb_asr_result(int event, const char* asr_result) static Eina_Bool __vc_widget_notify_state_changed(void *data) { vc_h vc_w = (vc_h)data; - if (NULL == vc_w) { - SLOG(LOG_ERROR, TAG_VCW, "[ERROR] Input parameter is NULL"); - return VC_ERROR_INVALID_PARAMETER; - } + RETVM_IF(NULL == vc_w, VC_ERROR_INVALID_PARAMETER, TAG_VCW, "[ERROR] Input parameter is NULL"); SLOG(LOG_DEBUG, TAG_VCW, "[CHECK] uid (%d)", vc_w->handle); @@ -1482,14 +1422,10 @@ int vc_widget_set_result_cb(vc_h vc_w, vc_result_cb callback, void* user_data) return VC_ERROR_NONE; } - if (NULL == vc_w) { - SLOG(LOG_ERROR, TAG_VCW, "[ERROR] Input parameter is NULL"); - return VC_ERROR_INVALID_PARAMETER; - } + RETVM_IF(NULL == vc_w, VC_ERROR_INVALID_PARAMETER, TAG_VCW, "[ERROR] Input parameter is NULL"); + RETVM_IF(NULL == callback, VC_ERROR_INVALID_PARAMETER, TAG_VCW, "[ERROR] Input parameter is NULL"); SLOG(LOG_DEBUG, TAG_VCW, "[CHECK] uid (%d)", vc_w->handle); - if (NULL == callback) - return VC_ERROR_INVALID_PARAMETER; vc_state_e state; if (0 != vc_widget_client_get_state(vc_w, &state)) { @@ -1497,10 +1433,7 @@ int vc_widget_set_result_cb(vc_h vc_w, vc_result_cb callback, void* user_data) } /* check state */ - if (state != VC_STATE_INITIALIZED) { - SLOG(LOG_ERROR, TAG_VCW, "[ERROR] Invalid State: Current state is not 'Initialized'"); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(state != VC_STATE_INITIALIZED, VC_ERROR_INVALID_STATE, TAG_VCW, "[ERROR] Invalid State: Current state is not 'Initialized'"); vc_widget_client_set_result_cb(vc_w, callback, user_data); @@ -1514,10 +1447,7 @@ int vc_widget_unset_result_cb(vc_h vc_w) return VC_ERROR_NONE; } - if (NULL == vc_w) { - SLOG(LOG_ERROR, TAG_VCW, "[ERROR] Input parameter is NULL"); - return VC_ERROR_INVALID_PARAMETER; - } + RETVM_IF(NULL == vc_w, VC_ERROR_INVALID_PARAMETER, TAG_VCW, "[ERROR] Input parameter is NULL"); SLOG(LOG_DEBUG, TAG_VCW, "[CHECK] uid (%d)", vc_w->handle); vc_state_e state; @@ -1527,10 +1457,7 @@ int vc_widget_unset_result_cb(vc_h vc_w) } /* check state */ - if (state != VC_STATE_INITIALIZED) { - SLOG(LOG_ERROR, TAG_VCW, "[ERROR] Invalid State: Current state is not 'Initialized'"); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(state != VC_STATE_INITIALIZED, VC_ERROR_INVALID_STATE, TAG_VCW, "[ERROR] Invalid State: Current state is not 'Initialized'"); vc_widget_client_set_result_cb(vc_w, NULL, NULL); @@ -1544,14 +1471,10 @@ int vc_widget_set_show_tooltip_cb(vc_h vc_w, vc_widget_show_tooltip_cb callback, return VC_ERROR_NONE; } - if (NULL == vc_w) { - SLOG(LOG_ERROR, TAG_VCW, "[ERROR] Input parameter is NULL"); - return VC_ERROR_INVALID_PARAMETER; - } + RETVM_IF(NULL == vc_w, VC_ERROR_INVALID_PARAMETER, TAG_VCW, "[ERROR] Input parameter is NULL"); + RETVM_IF(NULL == callback, VC_ERROR_INVALID_PARAMETER, TAG_VCW, "[ERROR] Input parameter is NULL"); SLOG(LOG_DEBUG, TAG_VCW, "[CHECK] uid (%d)", vc_w->handle); - if (NULL == callback) - return VC_ERROR_INVALID_PARAMETER; vc_state_e state; if (0 != vc_widget_client_get_state(vc_w, &state)) { @@ -1560,10 +1483,7 @@ int vc_widget_set_show_tooltip_cb(vc_h vc_w, vc_widget_show_tooltip_cb callback, } /* check state */ - if (state != VC_STATE_INITIALIZED) { - SLOG(LOG_ERROR, TAG_VCW, "[ERROR] Invalid State: Current state is not 'Initialized'"); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(state != VC_STATE_INITIALIZED, VC_ERROR_INVALID_STATE, TAG_VCW, "[ERROR] Invalid State: Current state is not 'Initialized'"); vc_widget_client_set_show_tooltip_cb(vc_w, callback, user_data); @@ -1577,10 +1497,7 @@ int vc_widget_unset_show_tooltip_cb(vc_h vc_w) return VC_ERROR_NONE; } - if (NULL == vc_w) { - SLOG(LOG_ERROR, TAG_VCW, "[ERROR] Input parameter is NULL"); - return VC_ERROR_INVALID_PARAMETER; - } + RETVM_IF(NULL == vc_w, VC_ERROR_INVALID_PARAMETER, TAG_VCW, "[ERROR] Input parameter is NULL"); SLOG(LOG_DEBUG, TAG_VCW, "[CHECK] uid (%d)", vc_w->handle); vc_state_e state; @@ -1590,10 +1507,7 @@ int vc_widget_unset_show_tooltip_cb(vc_h vc_w) } /* check state */ - if (state != VC_STATE_INITIALIZED) { - SLOG(LOG_ERROR, TAG_VCW, "[ERROR] Invalid State: Current state is not 'Initialized'"); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(state != VC_STATE_INITIALIZED, VC_ERROR_INVALID_STATE, TAG_VCW, "[ERROR] Invalid State: Current state is not 'Initialized'"); vc_widget_client_set_show_tooltip_cb(vc_w, NULL, NULL); @@ -1607,10 +1521,7 @@ int vc_widget_set_send_current_command_list_cb(vc_h vc_w, vc_widget_send_current return VC_ERROR_NONE; } - if (NULL == vc_w) { - SLOG(LOG_ERROR, TAG_VCW, "[ERROR] Input parameter is NULL"); - return VC_ERROR_INVALID_PARAMETER; - } + RETVM_IF(NULL == vc_w, VC_ERROR_INVALID_PARAMETER, TAG_VCW, "[ERROR] Input parameter is NULL"); SLOG(LOG_DEBUG, TAG_VCW, "[CHECK] uid (%d)", vc_w->handle); vc_state_e state; @@ -1620,10 +1531,7 @@ int vc_widget_set_send_current_command_list_cb(vc_h vc_w, vc_widget_send_current } /* check state */ - if (state != VC_STATE_INITIALIZED) { - SLOG(LOG_ERROR, TAG_VCW, "[ERROR] Invalid State: Current state is not 'Initialized'"); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(state != VC_STATE_INITIALIZED, VC_ERROR_INVALID_STATE, TAG_VCW, "[ERROR] Invalid State: Current state is not 'Initialized'"); vc_widget_client_set_send_command_list_cb(vc_w, callback, user_data); @@ -1637,10 +1545,7 @@ int vc_widget_unset_send_current_command_list_cb(vc_h vc_w) return VC_ERROR_NONE; } - if (NULL == vc_w) { - SLOG(LOG_ERROR, TAG_VCW, "[ERROR] Input parameter is NULL"); - return VC_ERROR_INVALID_PARAMETER; - } + RETVM_IF(NULL == vc_w, VC_ERROR_INVALID_PARAMETER, TAG_VCW, "[ERROR] Input parameter is NULL"); SLOG(LOG_DEBUG, TAG_VCW, "[CHECK] uid (%d)", vc_w->handle); vc_state_e state; @@ -1650,10 +1555,7 @@ int vc_widget_unset_send_current_command_list_cb(vc_h vc_w) } /* check state */ - if (state != VC_STATE_INITIALIZED) { - SLOG(LOG_ERROR, TAG_VCW, "[ERROR] Invalid State: Current state is not 'Initialized'"); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(state != VC_STATE_INITIALIZED, VC_ERROR_INVALID_STATE, TAG_VCW, "[ERROR] Invalid State: Current state is not 'Initialized'"); vc_widget_client_set_send_command_list_cb(vc_w, NULL, NULL); @@ -1713,10 +1615,7 @@ int vc_widget_set_service_state_changed_cb(vc_h vc_w, vc_service_state_changed_c return VC_ERROR_NONE; } - if (NULL == vc_w) { - SLOG(LOG_ERROR, TAG_VCW, "[ERROR] Input parameter is NULL"); - return VC_ERROR_INVALID_PARAMETER; - } + RETVM_IF(NULL == vc_w, VC_ERROR_INVALID_PARAMETER, TAG_VCW, "[ERROR] Input parameter is NULL"); SLOG(LOG_DEBUG, TAG_VCW, "[CHECK] uid (%d)", vc_w->handle); vc_state_e state; @@ -1726,10 +1625,7 @@ int vc_widget_set_service_state_changed_cb(vc_h vc_w, vc_service_state_changed_c } /* check state */ - if (state != VC_STATE_INITIALIZED) { - SLOG(LOG_ERROR, TAG_VCW, "[ERROR] Invalid State: Current state is not 'Initialized'"); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(state != VC_STATE_INITIALIZED, VC_ERROR_INVALID_STATE, TAG_VCW, "[ERROR] Invalid State: Current state is not 'Initialized'"); vc_widget_client_set_service_state_changed_cb(vc_w, callback, user_data); @@ -1743,10 +1639,7 @@ int vc_widget_unset_service_state_changed_cb(vc_h vc_w) return VC_ERROR_NONE; } - if (NULL == vc_w) { - SLOG(LOG_ERROR, TAG_VCW, "[ERROR] Input parameter is NULL"); - return VC_ERROR_INVALID_PARAMETER; - } + RETVM_IF(NULL == vc_w, VC_ERROR_INVALID_PARAMETER, TAG_VCW, "[ERROR] Input parameter is NULL"); SLOG(LOG_DEBUG, TAG_VCW, "[CHECK] uid (%d)", vc_w->handle); vc_state_e state; @@ -1756,10 +1649,7 @@ int vc_widget_unset_service_state_changed_cb(vc_h vc_w) } /* check state */ - if (state != VC_STATE_INITIALIZED) { - SLOG(LOG_ERROR, TAG_VCW, "[ERROR] Invalid State: Current state is not 'Initialized'"); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(state != VC_STATE_INITIALIZED, VC_ERROR_INVALID_STATE, TAG_VCW, "[ERROR] Invalid State: Current state is not 'Initialized'"); vc_widget_client_set_service_state_changed_cb(vc_w, NULL, NULL); @@ -1773,14 +1663,10 @@ int vc_widget_set_state_changed_cb(vc_h vc_w, vc_state_changed_cb callback, void return VC_ERROR_NONE; } - if (NULL == vc_w) { - SLOG(LOG_ERROR, TAG_VCW, "[ERROR] Input parameter is NULL"); - return VC_ERROR_INVALID_PARAMETER; - } + RETVM_IF(NULL == vc_w, VC_ERROR_INVALID_PARAMETER, TAG_VCW, "[ERROR] Input parameter is NULL"); + RETVM_IF(NULL == callback, VC_ERROR_INVALID_PARAMETER, TAG_VCW, "[ERROR] Input parameter is NULL"); SLOG(LOG_DEBUG, TAG_VCW, "[CHECK] uid (%d)", vc_w->handle); - if (NULL == callback) - return VC_ERROR_INVALID_PARAMETER; vc_state_e state; if (0 != vc_widget_client_get_state(vc_w, &state)) { @@ -1789,10 +1675,7 @@ int vc_widget_set_state_changed_cb(vc_h vc_w, vc_state_changed_cb callback, void } /* check state */ - if (state != VC_STATE_INITIALIZED) { - SLOG(LOG_ERROR, TAG_VCW, "[ERROR] Invalid State: Current state is not 'Initialized'"); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(state != VC_STATE_INITIALIZED, VC_ERROR_INVALID_STATE, TAG_VCW, "[ERROR] Invalid State: Current state is not 'Initialized'"); vc_widget_client_set_state_changed_cb(vc_w, callback, user_data); @@ -1806,10 +1689,7 @@ int vc_widget_unset_state_changed_cb(vc_h vc_w) return VC_ERROR_NONE; } - if (NULL == vc_w) { - SLOG(LOG_ERROR, TAG_VCW, "[ERROR] Input parameter is NULL"); - return VC_ERROR_INVALID_PARAMETER; - } + RETVM_IF(NULL == vc_w, VC_ERROR_INVALID_PARAMETER, TAG_VCW, "[ERROR] Input parameter is NULL"); SLOG(LOG_DEBUG, TAG_VCW, "[CHECK] uid (%d)", vc_w->handle); vc_state_e state; @@ -1819,10 +1699,7 @@ int vc_widget_unset_state_changed_cb(vc_h vc_w) } /* check state */ - if (state != VC_STATE_INITIALIZED) { - SLOG(LOG_ERROR, TAG_VCW, "[ERROR] Invalid State: Current state is not 'Initialized'"); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(state != VC_STATE_INITIALIZED, VC_ERROR_INVALID_STATE, TAG_VCW, "[ERROR] Invalid State: Current state is not 'Initialized'"); vc_widget_client_set_state_changed_cb(vc_w, NULL, NULL); @@ -1836,14 +1713,10 @@ int vc_widget_set_asr_result_cb(vc_h vc_w, vc_asr_result_cb callback, void* user return VC_ERROR_NONE; } - if (NULL == vc_w) { - SLOG(LOG_ERROR, TAG_VCW, "[ERROR] Input parameter is NULL"); - return VC_ERROR_INVALID_PARAMETER; - } + RETVM_IF(NULL == vc_w, VC_ERROR_INVALID_PARAMETER, TAG_VCW, "[ERROR] Input parameter is NULL"); + RETVM_IF(NULL == callback, VC_ERROR_INVALID_PARAMETER, TAG_VCW, "[ERROR] Input parameter is NULL"); SLOG(LOG_DEBUG, TAG_VCW, "[CHECK] uid (%d)", vc_w->handle); - if (NULL == callback) - return VC_ERROR_INVALID_PARAMETER; vc_state_e state; if (0 != vc_widget_client_get_state(vc_w, &state)) { @@ -1852,10 +1725,7 @@ int vc_widget_set_asr_result_cb(vc_h vc_w, vc_asr_result_cb callback, void* user } /* check state */ - if (state != VC_STATE_INITIALIZED) { - SLOG(LOG_ERROR, TAG_VCW, "[ERROR] Invalid State: Current state is not 'Initialized'"); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(state != VC_STATE_INITIALIZED, VC_ERROR_INVALID_STATE, TAG_VCW, "[ERROR] Invalid State: Current state is not 'Initialized'"); vc_widget_client_set_asr_result_cb(vc_w, callback, user_data); @@ -1869,10 +1739,7 @@ int vc_widget_unset_asr_result_cb(vc_h vc_w) return VC_ERROR_NONE; } - if (NULL == vc_w) { - SLOG(LOG_ERROR, TAG_VCW, "[ERROR] Input parameter is NULL"); - return VC_ERROR_INVALID_PARAMETER; - } + RETVM_IF(NULL == vc_w, VC_ERROR_INVALID_PARAMETER, TAG_VCW, "[ERROR] Input parameter is NULL"); SLOG(LOG_DEBUG, TAG_VCW, "[CHECK] uid (%d)", vc_w->handle); vc_state_e state; @@ -1882,10 +1749,7 @@ int vc_widget_unset_asr_result_cb(vc_h vc_w) } /* check state */ - if (state != VC_STATE_INITIALIZED) { - SLOG(LOG_ERROR, TAG_VCW, "[ERROR] Invalid State: Current state is not 'Initialized'"); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(state != VC_STATE_INITIALIZED, VC_ERROR_INVALID_STATE, TAG_VCW, "[ERROR] Invalid State: Current state is not 'Initialized'"); vc_widget_client_set_asr_result_cb(vc_w, NULL, NULL); @@ -1899,14 +1763,10 @@ int vc_widget_set_current_language_changed_cb(vc_h vc_w, vc_current_language_cha return VC_ERROR_NONE; } - if (NULL == vc_w) { - SLOG(LOG_ERROR, TAG_VCW, "[ERROR] Input parameter is NULL"); - return VC_ERROR_INVALID_PARAMETER; - } + RETVM_IF(NULL == vc_w, VC_ERROR_INVALID_PARAMETER, TAG_VCW, "[ERROR] Input parameter is NULL"); + RETVM_IF(NULL == callback, VC_ERROR_INVALID_PARAMETER, TAG_VCW, "[ERROR] Input parameter is NULL"); SLOG(LOG_DEBUG, TAG_VCW, "[CHECK] uid (%d)", vc_w->handle); - if (NULL == callback) - return VC_ERROR_INVALID_PARAMETER; vc_state_e state; if (0 != vc_widget_client_get_state(vc_w, &state)) { @@ -1915,10 +1775,7 @@ int vc_widget_set_current_language_changed_cb(vc_h vc_w, vc_current_language_cha } /* check state */ - if (state != VC_STATE_INITIALIZED) { - SLOG(LOG_ERROR, TAG_VCW, "[ERROR] Invalid State: Current state is not 'Initialized'"); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(state != VC_STATE_INITIALIZED, VC_ERROR_INVALID_STATE, TAG_VCW, "[ERROR] Invalid State: Current state is not 'Initialized'"); vc_widget_client_set_current_lang_changed_cb(vc_w, callback, user_data); @@ -1932,10 +1789,7 @@ int vc_widget_unset_current_language_changed_cb(vc_h vc_w) return VC_ERROR_NONE; } - if (NULL == vc_w) { - SLOG(LOG_ERROR, TAG_VCW, "[ERROR] Input parameter is NULL"); - return VC_ERROR_INVALID_PARAMETER; - } + RETVM_IF(NULL == vc_w, VC_ERROR_INVALID_PARAMETER, TAG_VCW, "[ERROR] Input parameter is NULL"); SLOG(LOG_DEBUG, TAG_VCW, "[CHECK] uid (%d)", vc_w->handle); vc_state_e state; @@ -1945,10 +1799,7 @@ int vc_widget_unset_current_language_changed_cb(vc_h vc_w) } /* check state */ - if (state != VC_STATE_INITIALIZED) { - SLOG(LOG_ERROR, TAG_VCW, "[ERROR] Invalid State: Current state is not 'Initialized'"); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(state != VC_STATE_INITIALIZED, VC_ERROR_INVALID_STATE, TAG_VCW, "[ERROR] Invalid State: Current state is not 'Initialized'"); vc_widget_client_set_current_lang_changed_cb(vc_w, NULL, NULL); @@ -1962,14 +1813,10 @@ int vc_widget_set_error_cb(vc_h vc_w, vc_error_cb callback, void* user_data) return VC_ERROR_NONE; } - if (NULL == vc_w) { - SLOG(LOG_ERROR, TAG_VCW, "[ERROR] Input parameter is NULL"); - return VC_ERROR_INVALID_PARAMETER; - } + RETVM_IF(NULL == vc_w, VC_ERROR_INVALID_PARAMETER, TAG_VCW, "[ERROR] Input parameter is NULL"); + RETVM_IF(NULL == callback, VC_ERROR_INVALID_PARAMETER, TAG_VCW, "[ERROR] Input parameter is NULL"); SLOG(LOG_DEBUG, TAG_VCW, "[CHECK] uid (%d)", vc_w->handle); - if (NULL == callback) - return VC_ERROR_INVALID_PARAMETER; vc_state_e state; if (0 != vc_widget_client_get_state(vc_w, &state)) { @@ -1978,10 +1825,7 @@ int vc_widget_set_error_cb(vc_h vc_w, vc_error_cb callback, void* user_data) } /* check state */ - if (state != VC_STATE_INITIALIZED) { - SLOG(LOG_ERROR, TAG_VCW, "[ERROR] Invalid State: Current state is not 'Initialized'"); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(state != VC_STATE_INITIALIZED, VC_ERROR_INVALID_STATE, TAG_VCW, "[ERROR] Invalid State: Current state is not 'Initialized'"); vc_widget_client_set_error_cb(vc_w, callback, user_data); @@ -1995,10 +1839,7 @@ int vc_widget_unset_error_cb(vc_h vc_w) return VC_ERROR_NONE; } - if (NULL == vc_w) { - SLOG(LOG_ERROR, TAG_VCW, "[ERROR] Input parameter is NULL"); - return VC_ERROR_INVALID_PARAMETER; - } + RETVM_IF(NULL == vc_w, VC_ERROR_INVALID_PARAMETER, TAG_VCW, "[ERROR] Input parameter is NULL"); SLOG(LOG_DEBUG, TAG_VCW, "[CHECK] uid (%d)", vc_w->handle); vc_state_e state; @@ -2008,10 +1849,7 @@ int vc_widget_unset_error_cb(vc_h vc_w) } /* check state */ - if (state != VC_STATE_INITIALIZED) { - SLOG(LOG_ERROR, TAG_VCW, "[ERROR] Invalid State: Current state is not 'Initialized'"); - return VC_ERROR_INVALID_STATE; - } + RETVM_IF(state != VC_STATE_INITIALIZED, VC_ERROR_INVALID_STATE, TAG_VCW, "[ERROR] Invalid State: Current state is not 'Initialized'"); vc_widget_client_set_error_cb(vc_w, NULL, NULL); diff --git a/common/vc_main.h b/common/vc_main.h index 6b6d400..3090848 100644 --- a/common/vc_main.h +++ b/common/vc_main.h @@ -65,20 +65,21 @@ typedef struct vc_s *vc_h; #define COLOR_LIGHTBLUE "\033[0;37m" #define COLOR_END "\033[0;m" -#define PERR(fmt, args...) LOGE(COLOR_RED "* Critical * " fmt COLOR_END, ##args) +// #define PERR(fmt, args...) LOGE(COLOR_RED "* Critical * " fmt COLOR_END, ##args) +#define PERR(tag, fmt, args...) SLOG(LOG_ERROR, tag, COLOR_RED "* Critical * " fmt COLOR_END, ##args) -#define RETM_IF(expr, fmt, arg...) \ +#define RETM_IF(expr, tag, fmt, arg...) \ do { \ if (expr) { \ - PERR(fmt, ##arg); \ + PERR(tag, fmt, ##arg); \ return; \ } \ } while (0) -#define RETVM_IF(expr, val, fmt, arg...) \ +#define RETVM_IF(expr, val, tag, fmt, arg...) \ do { \ if (expr) { \ - PERR(fmt, ##arg); \ + PERR(tag, fmt, ##arg); \ return (val); \ } \ } while (0) diff --git a/server/vcd_tidl.c b/server/vcd_tidl.c index b7709f3..ac18b4b 100644 --- a/server/vcd_tidl.c +++ b/server/vcd_tidl.c @@ -131,34 +131,40 @@ static void __request_tidl_connect(vcd_client_type_e type, int pid) } } -void __send_msg(bundle* msg, vcd_client_type_e type, int pid) +void __send_msg_to_mgr(bundle* msg) { - SLOG(LOG_INFO, TAG_VCD, "[TIDL] send msg start"); - - if (VCD_CLIENT_TYPE_MANAGER == type) { - pthread_mutex_lock(&g_mgr_tidl_info_mutex); + pthread_mutex_lock(&g_mgr_tidl_info_mutex); - SLOG(LOG_INFO, TAG_VCD, "[TIDL] message to manager"); - manager_tidl_info_s* mgr_tidl_info = vcd_client_manager_get_tidl_info(); - if (NULL == mgr_tidl_info) { - SLOG(LOG_ERROR, TAG_VCD, "[TIDL] tidl proxy info not allocated"); - pthread_mutex_unlock(&g_mgr_tidl_info_mutex); - return; - } + SLOG(LOG_INFO, TAG_VCD, "[TIDL] message to manager"); + manager_tidl_info_s* mgr_tidl_info = vcd_client_manager_get_tidl_info(); + if (NULL == mgr_tidl_info) { + SLOG(LOG_ERROR, TAG_VCD, "[TIDL] tidl proxy info not allocated"); + pthread_mutex_unlock(&g_mgr_tidl_info_mutex); + return; + } - rpc_port_stub_vcd_mgr_stub_vc_mgr_notify_cb_h handle = mgr_tidl_info->notify_cb; - if (NULL == handle) { - SLOG(LOG_ERROR, TAG_VCD, "[TIDL] notify callback handle is null"); - pthread_mutex_unlock(&g_mgr_tidl_info_mutex); - return; - } + rpc_port_stub_vcd_mgr_stub_vc_mgr_notify_cb_h handle = mgr_tidl_info->notify_cb; + if (NULL == handle) { + SLOG(LOG_ERROR, TAG_VCD, "[TIDL] notify callback handle is null"); + pthread_mutex_unlock(&g_mgr_tidl_info_mutex); + return; + } - if (0 != rpc_port_stub_vcd_mgr_stub_vc_mgr_notify_cb_invoke(handle, msg)) { - SLOG(LOG_ERROR, TAG_VCD, "[Server ERROR] Fail to send msg"); - pthread_mutex_unlock(&g_mgr_tidl_info_mutex); - return; - } + if (0 != rpc_port_stub_vcd_mgr_stub_vc_mgr_notify_cb_invoke(handle, msg)) { + SLOG(LOG_ERROR, TAG_VCD, "[Server ERROR] Fail to send msg"); pthread_mutex_unlock(&g_mgr_tidl_info_mutex); + return; + } + pthread_mutex_unlock(&g_mgr_tidl_info_mutex); + return; +} + +void __send_msg(bundle* msg, vcd_client_type_e type, int pid) +{ + SLOG(LOG_INFO, TAG_VCD, "[TIDL] send msg start"); + + if (VCD_CLIENT_TYPE_MANAGER == type) { + __send_msg_to_mgr(msg); } else if (VCD_CLIENT_TYPE_NORMAL == type) { pthread_mutex_lock(&g_client_tidl_info_mutex); @@ -218,29 +224,7 @@ void __send_signal(bundle* msg, vcd_client_type_e type) SLOG(LOG_INFO, TAG_VCD, "[TIDL] send signal start"); if (VCD_CLIENT_TYPE_MANAGER == type) { - pthread_mutex_lock(&g_mgr_tidl_info_mutex); - - SLOG(LOG_INFO, TAG_VCD, "[TIDL] message to manager"); - manager_tidl_info_s* mgr_tidl_info = vcd_client_manager_get_tidl_info(); - if (NULL == mgr_tidl_info) { - SLOG(LOG_ERROR, TAG_VCD, "[TIDL] tidl proxy info not allocated"); - pthread_mutex_unlock(&g_mgr_tidl_info_mutex); - return; - } - - rpc_port_stub_vcd_mgr_stub_vc_mgr_notify_cb_h handle = mgr_tidl_info->notify_cb; - if (NULL == handle) { - SLOG(LOG_ERROR, TAG_VCD, "[TIDL] notify callback handle is null"); - pthread_mutex_unlock(&g_mgr_tidl_info_mutex); - return; - } - - if (0 != rpc_port_stub_vcd_mgr_stub_vc_mgr_notify_cb_invoke(handle, msg)) { - SLOG(LOG_ERROR, TAG_VCD, "[Server ERROR] Fail to send msg"); - pthread_mutex_unlock(&g_mgr_tidl_info_mutex); - return; - } - pthread_mutex_unlock(&g_mgr_tidl_info_mutex); + __send_msg_to_mgr(msg); } /* signal to MANAGER */ else if (VCD_CLIENT_TYPE_NORMAL == type) { pthread_mutex_lock(&g_client_tidl_info_mutex); -- 2.34.1