From: taesub.kim Date: Thu, 16 Aug 2018 07:37:25 +0000 (+0900) Subject: Refactor duplicate codes X-Git-Tag: submit/tizen/20180821.220617^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=eb518394379999c624e9fde226cf15572dfe45f7;p=platform%2Fcore%2Fapi%2Fasp.git Refactor duplicate codes Change-Id: I06bf8bc5de5a8d471a48678341e15c67ef25aa28 Signed-off-by: Taesub Kim --- diff --git a/src/asp-client.c b/src/asp-client.c old mode 100644 new mode 100755 index 08ad4c7..6b5b17a --- a/src/asp-client.c +++ b/src/asp-client.c @@ -277,7 +277,7 @@ void asp_process_seek_search_result(GDBusConnection *connection, return; } - client->seek_search_result_cb(error_code,(asp_seek_service_h)seek, service_mac, + client->seek_search_result_cb(error_code, (asp_seek_service_h)seek, service_mac, advertisement_id, (asp_wps_type_e)config_method, instance_name, service_info, service_info_len, status, client->user_data_for_cb_seek_search_result); @@ -802,12 +802,7 @@ int asp_deinitialize(void) __ASP_LOG_FUNC_START__; CHECK_FEATURE_SUPPORTED(TIZEN_FEATURE_ASP); - - if (g_client_info.is_registered == false) { - ASP_LOGE("Client is already deregistered"); - __ASP_LOG_FUNC_END__; - return ASP_ERROR_NOT_INITIALIZED; - } + RET_ERR_IF_NOT_INITIALIZED(__ASP_LOG_FUNC_END__); asp_dbus_deinit(); @@ -839,18 +834,9 @@ int asp_seek_set_search_result_cb(asp_seek_search_result_cb cb, void *user_data) __ASP_LOG_FUNC_START__; CHECK_FEATURE_SUPPORTED(TIZEN_FEATURE_ASP); + RET_ERR_IF_NOT_INITIALIZED(__ASP_LOG_FUNC_END__); + RET_ERR_IF_PARAMETER_IS_NOT_VALID(cb, __ASP_LOG_FUNC_END__); - if (!cb) { - ASP_LOGE("Invalid parameter"); - __ASP_LOG_FUNC_END__; - return ASP_ERROR_INVALID_PARAMETER; - } - - if (g_client_info.is_registered == false) { - ASP_LOGE("Client is not initialized."); - __ASP_LOG_FUNC_END__; - return ASP_ERROR_NOT_INITIALIZED; - } g_client_info.seek_search_result_cb = cb; g_client_info.user_data_for_cb_seek_search_result = user_data; @@ -864,12 +850,7 @@ int asp_seek_unset_search_result_cb(void) __ASP_LOG_FUNC_START__; CHECK_FEATURE_SUPPORTED(TIZEN_FEATURE_ASP); - - if (g_client_info.is_registered == false) { - ASP_LOGE("Client is not initialized.\n"); - __ASP_LOG_FUNC_END__; - return ASP_ERROR_NOT_INITIALIZED; - } + RET_ERR_IF_NOT_INITIALIZED(__ASP_LOG_FUNC_END__); g_client_info.seek_search_result_cb = NULL; g_client_info.user_data_for_cb_seek_search_result = NULL; @@ -883,18 +864,8 @@ int asp_advert_set_status_changed_cb(asp_advert_status_changed_cb cb, void *user __ASP_LOG_FUNC_START__; CHECK_FEATURE_SUPPORTED(TIZEN_FEATURE_ASP); - - if (!cb) { - ASP_LOGE("Invalid parameter"); - __ASP_LOG_FUNC_END__; - return ASP_ERROR_INVALID_PARAMETER; - } - - if (g_client_info.is_registered == false) { - ASP_LOGE("Client is not initialized."); - __ASP_LOG_FUNC_END__; - return ASP_ERROR_NOT_INITIALIZED; - } + RET_ERR_IF_NOT_INITIALIZED(__ASP_LOG_FUNC_END__); + RET_ERR_IF_PARAMETER_IS_NOT_VALID(cb, __ASP_LOG_FUNC_END__); g_client_info.advert_status_changed_cb = cb; g_client_info.user_data_for_cb_advert_status_changed = user_data; @@ -908,12 +879,7 @@ int asp_advert_unset_status_changed_cb(void) __ASP_LOG_FUNC_START__; CHECK_FEATURE_SUPPORTED(TIZEN_FEATURE_ASP); - - if (g_client_info.is_registered == false) { - ASP_LOGE("Client is not initialized.\n"); - __ASP_LOG_FUNC_END__; - return ASP_ERROR_NOT_INITIALIZED; - } + RET_ERR_IF_NOT_INITIALIZED(__ASP_LOG_FUNC_END__); g_client_info.advert_status_changed_cb = NULL; g_client_info.user_data_for_cb_advert_status_changed = NULL; @@ -927,18 +893,8 @@ int asp_session_set_request_cb(asp_session_request_cb cb, void *user_data) __ASP_LOG_FUNC_START__; CHECK_FEATURE_SUPPORTED(TIZEN_FEATURE_ASP); - - if (!cb) { - ASP_LOGE("Invalid parameter"); - __ASP_LOG_FUNC_END__; - return ASP_ERROR_INVALID_PARAMETER; - } - - if (g_client_info.is_registered == false) { - ASP_LOGE("Client is not initialized."); - __ASP_LOG_FUNC_END__; - return ASP_ERROR_NOT_INITIALIZED; - } + RET_ERR_IF_NOT_INITIALIZED(__ASP_LOG_FUNC_END__); + RET_ERR_IF_PARAMETER_IS_NOT_VALID(cb, __ASP_LOG_FUNC_END__); g_client_info.session_request_cb = cb; g_client_info.user_data_for_cb_session_request = user_data; @@ -952,12 +908,7 @@ int asp_session_unset_request_cb(void) __ASP_LOG_FUNC_START__; CHECK_FEATURE_SUPPORTED(TIZEN_FEATURE_ASP); - - if (g_client_info.is_registered == false) { - ASP_LOGE("Client is not initialized.\n"); - __ASP_LOG_FUNC_END__; - return ASP_ERROR_NOT_INITIALIZED; - } + RET_ERR_IF_NOT_INITIALIZED(__ASP_LOG_FUNC_END__); g_client_info.session_request_cb = NULL; g_client_info.user_data_for_cb_session_request = NULL; @@ -971,18 +922,8 @@ int asp_session_set_config_request_cb(asp_session_config_request_cb cb, void *us __ASP_LOG_FUNC_START__; CHECK_FEATURE_SUPPORTED(TIZEN_FEATURE_ASP); - - if (!cb) { - ASP_LOGE("Invalid parameter"); - __ASP_LOG_FUNC_END__; - return ASP_ERROR_INVALID_PARAMETER; - } - - if (g_client_info.is_registered == false) { - ASP_LOGE("Client is not initialized."); - __ASP_LOG_FUNC_END__; - return ASP_ERROR_NOT_INITIALIZED; - } + RET_ERR_IF_NOT_INITIALIZED(__ASP_LOG_FUNC_END__); + RET_ERR_IF_PARAMETER_IS_NOT_VALID(cb, __ASP_LOG_FUNC_END__); g_client_info.session_config_request_cb = cb; g_client_info.user_data_for_cb_session_config_request = user_data; @@ -996,12 +937,7 @@ int asp_session_unset_config_request_cb(void) __ASP_LOG_FUNC_START__; CHECK_FEATURE_SUPPORTED(TIZEN_FEATURE_ASP); - - if (g_client_info.is_registered == false) { - ASP_LOGE("Client is not initialized.\n"); - __ASP_LOG_FUNC_END__; - return ASP_ERROR_NOT_INITIALIZED; - } + RET_ERR_IF_NOT_INITIALIZED(__ASP_LOG_FUNC_END__); g_client_info.session_config_request_cb = NULL; g_client_info.user_data_for_cb_session_config_request = NULL; @@ -1015,18 +951,8 @@ int asp_session_set_connect_status_cb(asp_session_connect_status_cb cb, void *us __ASP_LOG_FUNC_START__; CHECK_FEATURE_SUPPORTED(TIZEN_FEATURE_ASP); - - if (!cb) { - ASP_LOGE("Invalid parameter"); - __ASP_LOG_FUNC_END__; - return ASP_ERROR_INVALID_PARAMETER; - } - - if (g_client_info.is_registered == false) { - ASP_LOGE("Client is not initialized."); - __ASP_LOG_FUNC_END__; - return ASP_ERROR_NOT_INITIALIZED; - } + RET_ERR_IF_NOT_INITIALIZED(__ASP_LOG_FUNC_END__); + RET_ERR_IF_PARAMETER_IS_NOT_VALID(cb, __ASP_LOG_FUNC_END__); g_client_info.session_connect_status_cb = cb; g_client_info.user_data_for_cb_session_connect_status = user_data; @@ -1041,12 +967,7 @@ int asp_session_unset_connect_status_cb(void) __ASP_LOG_FUNC_START__; CHECK_FEATURE_SUPPORTED(TIZEN_FEATURE_ASP); - - if (g_client_info.is_registered == false) { - ASP_LOGE("Client is not initialized.\n"); - __ASP_LOG_FUNC_END__; - return ASP_ERROR_NOT_INITIALIZED; - } + RET_ERR_IF_NOT_INITIALIZED(__ASP_LOG_FUNC_END__); g_client_info.session_connect_status_cb = NULL; g_client_info.user_data_for_cb_session_connect_status = NULL; @@ -1060,18 +981,8 @@ int asp_session_set_status_cb(asp_session_status_cb cb, void *user_data) __ASP_LOG_FUNC_START__; CHECK_FEATURE_SUPPORTED(TIZEN_FEATURE_ASP); - - if (!cb) { - ASP_LOGE("Invalid parameter"); - __ASP_LOG_FUNC_END__; - return ASP_ERROR_INVALID_PARAMETER; - } - - if (g_client_info.is_registered == false) { - ASP_LOGE("Client is not initialized."); - __ASP_LOG_FUNC_END__; - return ASP_ERROR_NOT_INITIALIZED; - } + RET_ERR_IF_NOT_INITIALIZED(__ASP_LOG_FUNC_END__); + RET_ERR_IF_PARAMETER_IS_NOT_VALID(cb, __ASP_LOG_FUNC_END__); g_client_info.session_status_cb = cb; g_client_info.user_data_for_cb_session_status = user_data; @@ -1086,12 +997,7 @@ int asp_session_unset_status_cb(void) __ASP_LOG_FUNC_START__; CHECK_FEATURE_SUPPORTED(TIZEN_FEATURE_ASP); - - if (g_client_info.is_registered == false) { - ASP_LOGE("Client is not initialized.\n"); - __ASP_LOG_FUNC_END__; - return ASP_ERROR_NOT_INITIALIZED; - } + RET_ERR_IF_NOT_INITIALIZED(__ASP_LOG_FUNC_END__); g_client_info.session_status_cb = NULL; g_client_info.user_data_for_cb_session_status = NULL; @@ -1105,18 +1011,8 @@ int asp_session_set_port_status_cb(asp_session_port_status_cb cb, void *user_dat __ASP_LOG_FUNC_START__; CHECK_FEATURE_SUPPORTED(TIZEN_FEATURE_ASP); - - if (!cb) { - ASP_LOGE("Invalid parameter"); - __ASP_LOG_FUNC_END__; - return ASP_ERROR_INVALID_PARAMETER; - } - - if (g_client_info.is_registered == false) { - ASP_LOGE("Client is not initialized."); - __ASP_LOG_FUNC_END__; - return ASP_ERROR_NOT_INITIALIZED; - } + RET_ERR_IF_NOT_INITIALIZED(__ASP_LOG_FUNC_END__); + RET_ERR_IF_PARAMETER_IS_NOT_VALID(cb, __ASP_LOG_FUNC_END__); g_client_info.session_port_status_cb = cb; g_client_info.user_data_for_cb_session_port_status = user_data; @@ -1130,12 +1026,7 @@ int asp_session_unset_port_status_cb(void) __ASP_LOG_FUNC_START__; CHECK_FEATURE_SUPPORTED(TIZEN_FEATURE_ASP); - - if (g_client_info.is_registered == false) { - ASP_LOGE("Client is not initialized.\n"); - __ASP_LOG_FUNC_END__; - return ASP_ERROR_NOT_INITIALIZED; - } + RET_ERR_IF_NOT_INITIALIZED(__ASP_LOG_FUNC_END__); g_client_info.session_port_status_cb = NULL; g_client_info.user_data_for_cb_session_port_status = NULL; @@ -1359,18 +1250,8 @@ int asp_advert_create(char *instance_name, asp_advert_service_h *adv_service) int res = ASP_ERROR_NONE; CHECK_FEATURE_SUPPORTED(TIZEN_FEATURE_ASP); - - if (g_client_info.is_registered == false) { - ASP_LOGE("Client is NOT registered"); - __ASP_LOG_FUNC_END__; - return ASP_ERROR_NOT_INITIALIZED; - } - - if (!adv_service) { - ASP_LOGE("NULL Param [handle]!"); - __ASP_LOG_FUNC_END__; - return ASP_ERROR_INVALID_PARAMETER; - } + RET_ERR_IF_NOT_INITIALIZED(__ASP_LOG_FUNC_END__); + RET_ERR_IF_PARAMETER_IS_NOT_VALID(adv_service, __ASP_LOG_FUNC_END__); service = (asp_client_advert_s *)g_try_malloc0(sizeof(asp_client_advert_s)); if (!service) { @@ -1422,18 +1303,9 @@ int asp_advert_destroy(asp_advert_service_h adv_service) int res = ASP_ERROR_NONE; CHECK_FEATURE_SUPPORTED(TIZEN_FEATURE_ASP); + RET_ERR_IF_NOT_INITIALIZED(__ASP_LOG_FUNC_END__); + RET_ERR_IF_PARAMETER_IS_NOT_VALID(adv_service, __ASP_LOG_FUNC_END__); - if (g_client_info.is_registered == false) { - ASP_LOGE("Client is NOT registered"); - __ASP_LOG_FUNC_END__; - return ASP_ERROR_NOT_INITIALIZED; - } - - if (!adv_service) { - ASP_LOGE("NULL handler!"); - __ASP_LOG_FUNC_END__; - return ASP_ERROR_INVALID_PARAMETER; - } ASP_LOGD("service [%p]", adv_service); service = __get_advert((void *)adv_service); @@ -1467,7 +1339,7 @@ static bool __is_valid_service_type_for_wfds(char *service_type) if (strlen(service_type) > MAX_SERVICE_TYPE_LEN) return false; - while(service_type[pos] != 0) { + while (service_type[pos] != 0) { if (!g_ascii_isalpha(service_type[pos]) && !g_ascii_isdigit(service_type[pos]) && service_type[pos] != '.' && @@ -1484,7 +1356,7 @@ static bool __is_valid_service_type(char *service_type) char *proto; int pos; - if(srv_name_len < 2) + if (srv_name_len < 2) return __is_valid_service_type_for_wfds(service_type); proto = &(service_type[srv_name_len + 1]); @@ -1504,7 +1376,7 @@ static bool __is_valid_service_type(char *service_type) return false; if (service_type[0] != '_' || service_type[1] == '-' || - service_type[srv_name_len] != '.') + service_type[srv_name_len] != '.') return false; pos = 1; @@ -1520,25 +1392,16 @@ static bool __is_valid_service_type(char *service_type) } int asp_advert_set_service_type(asp_advert_service_h adv_service, - char *service_type) + char *service_type) { __ASP_LOG_FUNC_START__; asp_client_advert_s *service = NULL; char *type = NULL; CHECK_FEATURE_SUPPORTED(TIZEN_FEATURE_ASP); - - if (g_client_info.is_registered == false) { - ASP_LOGE("Client is NOT registered"); - __ASP_LOG_FUNC_END__; - return ASP_ERROR_NOT_INITIALIZED; - } - - if (!adv_service || !service_type) { - ASP_LOGE("NULL handler!"); - __ASP_LOG_FUNC_END__; - return ASP_ERROR_INVALID_PARAMETER; - } + RET_ERR_IF_NOT_INITIALIZED(__ASP_LOG_FUNC_END__); + RET_ERR_IF_PARAMETER_IS_NOT_VALID(adv_service, __ASP_LOG_FUNC_END__); + RET_ERR_IF_PARAMETER_IS_NOT_VALID(service_type, __ASP_LOG_FUNC_END__); if (strlen(service_type) == 0) { ASP_LOGE("Zero length value"); @@ -1576,24 +1439,15 @@ int asp_advert_set_service_type(asp_advert_service_h adv_service, } int asp_advert_set_auto_accept(asp_advert_service_h adv_service, - bool auto_accept) + bool auto_accept) { __ASP_LOG_FUNC_START__; asp_client_advert_s *service = NULL; CHECK_FEATURE_SUPPORTED(TIZEN_FEATURE_ASP); + RET_ERR_IF_NOT_INITIALIZED(__ASP_LOG_FUNC_END__); + RET_ERR_IF_PARAMETER_IS_NOT_VALID(adv_service, __ASP_LOG_FUNC_END__); - if (g_client_info.is_registered == false) { - ASP_LOGE("Client is NOT registered"); - __ASP_LOG_FUNC_END__; - return ASP_ERROR_NOT_INITIALIZED; - } - - if (!adv_service) { - ASP_LOGE("NULL handler!"); - __ASP_LOG_FUNC_END__; - return ASP_ERROR_INVALID_PARAMETER; - } ASP_LOGD("service [%p]", adv_service); service = __get_advert((void *)adv_service); @@ -1627,24 +1481,16 @@ static bool __is_valid_key(const char *key) } int asp_advert_add_info(asp_advert_service_h adv_service, - const char *key, const char *value) + const char *key, const char *value) { __ASP_LOG_FUNC_START__; asp_client_advert_s *service = NULL; CHECK_FEATURE_SUPPORTED(TIZEN_FEATURE_ASP); + RET_ERR_IF_PARAMETER_IS_NOT_VALID(adv_service, __ASP_LOG_FUNC_END__); + RET_ERR_IF_PARAMETER_IS_NOT_VALID(key, __ASP_LOG_FUNC_END__); + RET_ERR_IF_NOT_INITIALIZED(__ASP_LOG_FUNC_END__); - if (g_client_info.is_registered == false) { - ASP_LOGE("Client is NOT registered"); - __ASP_LOG_FUNC_END__; - return ASP_ERROR_NOT_INITIALIZED; - } - - if (!adv_service || !key) { - ASP_LOGE("NULL value!"); - __ASP_LOG_FUNC_END__; - return ASP_ERROR_INVALID_PARAMETER; - } ASP_LOGD("service [%p]", adv_service); if (__is_valid_key(key)) { @@ -1669,25 +1515,17 @@ int asp_advert_add_info(asp_advert_service_h adv_service, } int asp_advert_get_info(asp_advert_service_h adv_service, const char *key, - int *length, char **value) + int *length, char **value) { __ASP_LOG_FUNC_START__; asp_client_advert_s *service = NULL; char *ret_val = NULL; CHECK_FEATURE_SUPPORTED(TIZEN_FEATURE_ASP); + RET_ERR_IF_PARAMETER_IS_NOT_VALID(adv_service, __ASP_LOG_FUNC_END__); + RET_ERR_IF_PARAMETER_IS_NOT_VALID(key, __ASP_LOG_FUNC_END__); + RET_ERR_IF_NOT_INITIALIZED(__ASP_LOG_FUNC_END__); - if (g_client_info.is_registered == false) { - ASP_LOGE("Client is NOT registered"); - __ASP_LOG_FUNC_END__; - return ASP_ERROR_NOT_INITIALIZED; - } - - if (!adv_service || !key) { - ASP_LOGE("NULL value!"); - __ASP_LOG_FUNC_END__; - return ASP_ERROR_INVALID_PARAMETER; - } ASP_LOGD("service [%p]", adv_service); service = __get_advert((void *)adv_service); @@ -1719,18 +1557,10 @@ int asp_advert_remove_info(asp_advert_service_h adv_service, const char *key) asp_client_advert_s *service = NULL; CHECK_FEATURE_SUPPORTED(TIZEN_FEATURE_ASP); + RET_ERR_IF_PARAMETER_IS_NOT_VALID(adv_service, __ASP_LOG_FUNC_END__); + RET_ERR_IF_PARAMETER_IS_NOT_VALID(key, __ASP_LOG_FUNC_END__); + RET_ERR_IF_NOT_INITIALIZED(__ASP_LOG_FUNC_END__); - if (g_client_info.is_registered == false) { - ASP_LOGE("Client is NOT registered"); - __ASP_LOG_FUNC_END__; - return ASP_ERROR_NOT_INITIALIZED; - } - - if (!adv_service || !key) { - ASP_LOGE("NULL value!"); - __ASP_LOG_FUNC_END__; - return ASP_ERROR_INVALID_PARAMETER; - } ASP_LOGD("service [%p]", adv_service); service = __get_advert((void *)adv_service); @@ -1749,24 +1579,15 @@ int asp_advert_remove_info(asp_advert_service_h adv_service, const char *key) } int asp_advert_set_status(asp_advert_service_h adv_service, - unsigned char status) + unsigned char status) { __ASP_LOG_FUNC_START__; asp_client_advert_s *service = NULL; CHECK_FEATURE_SUPPORTED(TIZEN_FEATURE_ASP); + RET_ERR_IF_NOT_INITIALIZED(__ASP_LOG_FUNC_END__); + RET_ERR_IF_PARAMETER_IS_NOT_VALID(adv_service, __ASP_LOG_FUNC_END__); - if (g_client_info.is_registered == false) { - ASP_LOGE("Client is NOT registered"); - __ASP_LOG_FUNC_END__; - return ASP_ERROR_NOT_INITIALIZED; - } - - if (!adv_service) { - ASP_LOGE("NULL handler!"); - __ASP_LOG_FUNC_END__; - return ASP_ERROR_INVALID_PARAMETER; - } ASP_LOGD("service [%p]", adv_service); service = __get_advert((void *)adv_service); @@ -1789,12 +1610,8 @@ int asp_advert_set_discovery_tech(asp_advert_service_h adv_service, int discover asp_client_advert_s *service = NULL; CHECK_FEATURE_SUPPORTED(TIZEN_FEATURE_ASP); + RET_ERR_IF_NOT_INITIALIZED(__ASP_LOG_FUNC_END__); - if (g_client_info.is_registered == false) { - ASP_LOGE("Client is NOT registered"); - __ASP_LOG_FUNC_END__; - return ASP_ERROR_NOT_INITIALIZED; - } if (!((discovery_tech & ASP_DISCOVERY_TECH_P2P) | (discovery_tech & ASP_DISCOVERY_TECH_NFC) | (discovery_tech & ASP_DISCOVERY_TECH_BLE) | @@ -1827,18 +1644,13 @@ int asp_advert_set_discovery_tech(asp_advert_service_h adv_service, int discover } int asp_advert_set_preferred_connection(asp_advert_service_h adv_service, - unsigned char preferred_connection) + unsigned char preferred_connection) { __ASP_LOG_FUNC_START__; asp_client_advert_s *service = NULL; CHECK_FEATURE_SUPPORTED(TIZEN_FEATURE_ASP); - - if (g_client_info.is_registered == false) { - ASP_LOGE("Client is NOT registered"); - __ASP_LOG_FUNC_END__; - return ASP_ERROR_NOT_INITIALIZED; - } + RET_ERR_IF_NOT_INITIALIZED(__ASP_LOG_FUNC_END__); if (!adv_service) { ASP_LOGE("NULL handler!"); @@ -1862,18 +1674,13 @@ int asp_advert_set_preferred_connection(asp_advert_service_h adv_service, } int asp_advert_set_p2p_role_scheme(asp_advert_service_h adv_service, - asp_advert_p2p_role_scheme_e role) + asp_advert_p2p_role_scheme_e role) { __ASP_LOG_FUNC_START__; asp_client_advert_s *service = NULL; CHECK_FEATURE_SUPPORTED(TIZEN_FEATURE_ASP); - - if (g_client_info.is_registered == false) { - ASP_LOGE("Client is NOT registered"); - __ASP_LOG_FUNC_END__; - return ASP_ERROR_NOT_INITIALIZED; - } + RET_ERR_IF_NOT_INITIALIZED(__ASP_LOG_FUNC_END__); if (!adv_service) { ASP_LOGE("NULL handler!"); @@ -1897,18 +1704,13 @@ int asp_advert_set_p2p_role_scheme(asp_advert_service_h adv_service, } int asp_advert_get_p2p_role_scheme(asp_advert_service_h adv_service, - asp_advert_p2p_role_scheme_e *role) + asp_advert_p2p_role_scheme_e *role) { __ASP_LOG_FUNC_START__; asp_client_advert_s *service = NULL; CHECK_FEATURE_SUPPORTED(TIZEN_FEATURE_ASP); - - if (g_client_info.is_registered == false) { - ASP_LOGE("Client is NOT registered"); - __ASP_LOG_FUNC_END__; - return ASP_ERROR_NOT_INITIALIZED; - } + RET_ERR_IF_NOT_INITIALIZED(__ASP_LOG_FUNC_END__); if (!adv_service || !role) { ASP_LOGE("NULL handler!"); @@ -1933,18 +1735,13 @@ int asp_advert_get_p2p_role_scheme(asp_advert_service_h adv_service, int asp_advert_set_p2p_config_method(asp_advert_service_h adv_service, - asp_wps_type_e config_method) + asp_wps_type_e config_method) { __ASP_LOG_FUNC_START__; asp_client_advert_s *service = NULL; CHECK_FEATURE_SUPPORTED(TIZEN_FEATURE_ASP); - - if (g_client_info.is_registered == false) { - ASP_LOGE("Client is NOT registered"); - __ASP_LOG_FUNC_END__; - return ASP_ERROR_NOT_INITIALIZED; - } + RET_ERR_IF_NOT_INITIALIZED(__ASP_LOG_FUNC_END__); if (!adv_service) { ASP_LOGE("NULL handler!"); @@ -1974,24 +1771,15 @@ int asp_advert_set_p2p_config_method(asp_advert_service_h adv_service, } int asp_advert_get_p2p_config_method(asp_advert_service_h adv_service, - asp_wps_type_e *config_method) + asp_wps_type_e *config_method) { __ASP_LOG_FUNC_START__; asp_client_advert_s *service = NULL; CHECK_FEATURE_SUPPORTED(TIZEN_FEATURE_ASP); - - if (g_client_info.is_registered == false) { - ASP_LOGE("Client is NOT registered"); - __ASP_LOG_FUNC_END__; - return ASP_ERROR_NOT_INITIALIZED; - } - - if (!adv_service || !config_method) { - ASP_LOGE("NULL handler!"); - __ASP_LOG_FUNC_END__; - return ASP_ERROR_INVALID_PARAMETER; - } + RET_ERR_IF_NOT_INITIALIZED(__ASP_LOG_FUNC_END__); + RET_ERR_IF_PARAMETER_IS_NOT_VALID(adv_service, __ASP_LOG_FUNC_END__); + RET_ERR_IF_PARAMETER_IS_NOT_VALID(config_method, __ASP_LOG_FUNC_END__); ASP_LOGD("service [%p]", adv_service); @@ -2011,19 +1799,15 @@ int asp_advert_get_p2p_config_method(asp_advert_service_h adv_service, } int asp_advert_set_p2p_response(asp_advert_service_h adv_service, - char *rsp_info, int length) + char *rsp_info, int length) { __ASP_LOG_FUNC_START__; asp_client_advert_s *service = NULL; char *info = NULL; CHECK_FEATURE_SUPPORTED(TIZEN_FEATURE_ASP); + RET_ERR_IF_NOT_INITIALIZED(__ASP_LOG_FUNC_END__); - if (g_client_info.is_registered == false) { - ASP_LOGE("Client is NOT registered"); - __ASP_LOG_FUNC_END__; - return ASP_ERROR_NOT_INITIALIZED; - } /* TODO fit the rsp info for length */ if (length <= 0 || length > DEFERRED_LEN) { ASP_LOGE("invalid length!"); @@ -2113,18 +1897,9 @@ int asp_advert_start_advertising(asp_advert_service_h adv_service) int ret = ASP_ERROR_NONE; CHECK_FEATURE_SUPPORTED(TIZEN_FEATURE_ASP); + RET_ERR_IF_NOT_INITIALIZED(__ASP_LOG_FUNC_END__); + RET_ERR_IF_PARAMETER_IS_NOT_VALID(adv_service, __ASP_LOG_FUNC_END__); - if (g_client_info.is_registered == false) { - ASP_LOGE("Client is NOT registered"); - __ASP_LOG_FUNC_END__; - return ASP_ERROR_NOT_INITIALIZED; - } - - if (!adv_service) { - ASP_LOGE("NULL handler!"); - __ASP_LOG_FUNC_END__; - return ASP_ERROR_INVALID_PARAMETER; - } ASP_LOGD("service [%p]", adv_service); service = __get_advert((void *)adv_service); @@ -2185,18 +1960,9 @@ int asp_advert_stop_advertising(asp_advert_service_h adv_service) int ret = ASP_ERROR_NONE; CHECK_FEATURE_SUPPORTED(TIZEN_FEATURE_ASP); + RET_ERR_IF_NOT_INITIALIZED(__ASP_LOG_FUNC_END__); + RET_ERR_IF_PARAMETER_IS_NOT_VALID(adv_service, __ASP_LOG_FUNC_END__); - if (g_client_info.is_registered == false) { - ASP_LOGE("Client is NOT registered"); - __ASP_LOG_FUNC_END__; - return ASP_ERROR_NOT_INITIALIZED; - } - - if (!adv_service) { - ASP_LOGE("NULL handler!"); - __ASP_LOG_FUNC_END__; - return ASP_ERROR_INVALID_PARAMETER; - } ASP_LOGD("service [%p]", adv_service); service = __get_advert((void *)adv_service); @@ -2228,7 +1994,7 @@ int asp_advert_stop_advertising(asp_advert_service_h adv_service) } int asp_advert_change_service_status(asp_advert_service_h adv_service, - unsigned char status) + unsigned char status) { __ASP_LOG_FUNC_START__; asp_client_advert_s *service = NULL; @@ -2239,18 +2005,9 @@ int asp_advert_change_service_status(asp_advert_service_h adv_service, int ret = ASP_ERROR_NONE; CHECK_FEATURE_SUPPORTED(TIZEN_FEATURE_ASP); + RET_ERR_IF_NOT_INITIALIZED(__ASP_LOG_FUNC_END__); + RET_ERR_IF_PARAMETER_IS_NOT_VALID(adv_service, __ASP_LOG_FUNC_END__); - if (g_client_info.is_registered == false) { - ASP_LOGE("Client is NOT registered"); - __ASP_LOG_FUNC_END__; - return ASP_ERROR_NOT_INITIALIZED; - } - - if (!adv_service) { - ASP_LOGE("NULL handler!"); - __ASP_LOG_FUNC_END__; - return ASP_ERROR_INVALID_PARAMETER; - } ASP_LOGD("service [%p]", adv_service); service = __get_advert((void *)adv_service); @@ -2308,12 +2065,7 @@ int asp_seek_create(char *service_type, asp_seek_service_h *seek_service) int res = ASP_ERROR_NONE; CHECK_FEATURE_SUPPORTED(TIZEN_FEATURE_ASP); - - if (g_client_info.is_registered == false) { - ASP_LOGE("Client is NOT registered"); - __ASP_LOG_FUNC_END__; - return ASP_ERROR_NOT_INITIALIZED; - } + RET_ERR_IF_NOT_INITIALIZED(__ASP_LOG_FUNC_END__); if (!service_type || strlen(service_type) == 0 || !__is_valid_service_type(service_type)) { ASP_LOGE("NULL Param [service_type]!"); @@ -2363,18 +2115,9 @@ int asp_seek_destroy(asp_seek_service_h seek_service) int res = ASP_ERROR_NONE; CHECK_FEATURE_SUPPORTED(TIZEN_FEATURE_ASP); + RET_ERR_IF_NOT_INITIALIZED(__ASP_LOG_FUNC_END__); + RET_ERR_IF_PARAMETER_IS_NOT_VALID(seek_service, __ASP_LOG_FUNC_END__); - if (g_client_info.is_registered == false) { - ASP_LOGE("Client is NOT registered"); - __ASP_LOG_FUNC_END__; - return ASP_ERROR_NOT_INITIALIZED; - } - - if (!seek_service) { - ASP_LOGE("NULL handler!"); - __ASP_LOG_FUNC_END__; - return ASP_ERROR_INVALID_PARAMETER; - } ASP_LOGD("service [%p]", seek_service); service = __get_seek((void *)seek_service); @@ -2405,13 +2148,11 @@ int asp_seek_add_info(asp_seek_service_h seek_service, const char *key) CHECK_FEATURE_SUPPORTED(TIZEN_FEATURE_ASP); - if (g_client_info.is_registered == false) { - ASP_LOGE("Client is NOT registered"); - __ASP_LOG_FUNC_END__; - return ASP_ERROR_NOT_INITIALIZED; - } + RET_ERR_IF_NOT_INITIALIZED(__ASP_LOG_FUNC_END__); + RET_ERR_IF_PARAMETER_IS_NOT_VALID(seek_service, __ASP_LOG_FUNC_END__); + RET_ERR_IF_PARAMETER_IS_NOT_VALID(key, __ASP_LOG_FUNC_END__); - if (!seek_service || !key || strlen(key) == 0) { + if (strlen(key) == 0) { ASP_LOGE("NULL handler!"); __ASP_LOG_FUNC_END__; return ASP_ERROR_INVALID_PARAMETER; @@ -2443,14 +2184,11 @@ int asp_seek_remove_info(asp_seek_service_h seek_service, const char *key) int res = ASP_ERROR_NONE; CHECK_FEATURE_SUPPORTED(TIZEN_FEATURE_ASP); + RET_ERR_IF_NOT_INITIALIZED(__ASP_LOG_FUNC_END__); + RET_ERR_IF_PARAMETER_IS_NOT_VALID(seek_service, __ASP_LOG_FUNC_END__); + RET_ERR_IF_PARAMETER_IS_NOT_VALID(key, __ASP_LOG_FUNC_END__); - if (g_client_info.is_registered == false) { - ASP_LOGE("Client is NOT registered"); - __ASP_LOG_FUNC_END__; - return ASP_ERROR_NOT_INITIALIZED; - } - - if (!seek_service || !key || strlen(key) == 0) { + if (strlen(key) == 0) { ASP_LOGE("NULL handler!"); __ASP_LOG_FUNC_END__; return ASP_ERROR_INVALID_PARAMETER; @@ -2481,11 +2219,9 @@ int asp_seek_set_discovery_tech(asp_seek_service_h seek_service, int discovery_t CHECK_FEATURE_SUPPORTED(TIZEN_FEATURE_ASP); - if (g_client_info.is_registered == false) { - ASP_LOGE("Client is NOT registered"); - __ASP_LOG_FUNC_END__; - return ASP_ERROR_NOT_INITIALIZED; - } + RET_ERR_IF_NOT_INITIALIZED(__ASP_LOG_FUNC_END__); + RET_ERR_IF_PARAMETER_IS_NOT_VALID(seek_service, __ASP_LOG_FUNC_END__); + if (!((discovery_tech & ASP_DISCOVERY_TECH_P2P) | (discovery_tech & ASP_DISCOVERY_TECH_NFC) | (discovery_tech & ASP_DISCOVERY_TECH_BLE) | @@ -2496,11 +2232,6 @@ int asp_seek_set_discovery_tech(asp_seek_service_h seek_service, int discovery_t return ASP_ERROR_INVALID_PARAMETER; } - if (!seek_service) { - ASP_LOGE("NULL handler!"); - __ASP_LOG_FUNC_END__; - return ASP_ERROR_INVALID_PARAMETER; - } ASP_LOGD("service [%p]", seek_service); service = __get_seek((void *)seek_service); @@ -2518,24 +2249,15 @@ int asp_seek_set_discovery_tech(asp_seek_service_h seek_service, int discovery_t } int asp_seek_set_preferred_connection(asp_seek_service_h seek_service, - unsigned char preferred_connection) + unsigned char preferred_connection) { __ASP_LOG_FUNC_START__; asp_client_seek_s *service = NULL; CHECK_FEATURE_SUPPORTED(TIZEN_FEATURE_ASP); + RET_ERR_IF_NOT_INITIALIZED(__ASP_LOG_FUNC_END__); + RET_ERR_IF_PARAMETER_IS_NOT_VALID(seek_service, __ASP_LOG_FUNC_END__); - if (g_client_info.is_registered == false) { - ASP_LOGE("Client is NOT registered"); - __ASP_LOG_FUNC_END__; - return ASP_ERROR_NOT_INITIALIZED; - } - - if (!seek_service) { - ASP_LOGE("NULL handler!"); - __ASP_LOG_FUNC_END__; - return ASP_ERROR_INVALID_PARAMETER; - } ASP_LOGD("service [%p]", seek_service); service = __get_seek((void *)seek_service); @@ -2564,18 +2286,9 @@ int asp_seek_start(asp_seek_service_h seek_service) int ret = ASP_ERROR_NONE; CHECK_FEATURE_SUPPORTED(TIZEN_FEATURE_ASP); + RET_ERR_IF_NOT_INITIALIZED(__ASP_LOG_FUNC_END__); + RET_ERR_IF_PARAMETER_IS_NOT_VALID(seek_service, __ASP_LOG_FUNC_END__); - if (g_client_info.is_registered == false) { - ASP_LOGE("Client is NOT registered"); - __ASP_LOG_FUNC_END__; - return ASP_ERROR_NOT_INITIALIZED; - } - - if (!seek_service) { - ASP_LOGE("NULL handler!"); - __ASP_LOG_FUNC_END__; - return ASP_ERROR_INVALID_PARAMETER; - } ASP_LOGD("service [%p]", seek_service); service = __get_seek((void *)seek_service); @@ -2629,18 +2342,8 @@ int asp_seek_stop(asp_seek_service_h seek_service) int ret = ASP_ERROR_NONE; CHECK_FEATURE_SUPPORTED(TIZEN_FEATURE_ASP); - - if (g_client_info.is_registered == false) { - ASP_LOGE("Client is NOT registered"); - __ASP_LOG_FUNC_END__; - return ASP_ERROR_NOT_INITIALIZED; - } - - if (!seek_service) { - ASP_LOGE("NULL handler!"); - __ASP_LOG_FUNC_END__; - return ASP_ERROR_INVALID_PARAMETER; - } + RET_ERR_IF_NOT_INITIALIZED(__ASP_LOG_FUNC_END__); + RET_ERR_IF_PARAMETER_IS_NOT_VALID(seek_service, __ASP_LOG_FUNC_END__); service = __get_seek((void *)seek_service); if (service == NULL) { @@ -2678,12 +2381,7 @@ int asp_session_create(char *service_mac, unsigned int adv_id, asp_session_h* se int res = ASP_ERROR_NONE; CHECK_FEATURE_SUPPORTED(TIZEN_FEATURE_ASP); - - if (g_client_info.is_registered == false) { - ASP_LOGE("Client is NOT registered"); - __ASP_LOG_FUNC_END__; - return ASP_ERROR_NOT_INITIALIZED; - } + RET_ERR_IF_NOT_INITIALIZED(__ASP_LOG_FUNC_END__); if (!service_mac || strlen(service_mac) != (MACSTR_LEN -1)) { ASP_LOGE("Invalid Param [service_mac]!"); @@ -2726,18 +2424,9 @@ int asp_session_destroy(asp_session_h session) int res = ASP_ERROR_NONE; CHECK_FEATURE_SUPPORTED(TIZEN_FEATURE_ASP); + RET_ERR_IF_NOT_INITIALIZED(__ASP_LOG_FUNC_END__); + RET_ERR_IF_PARAMETER_IS_NOT_VALID(session, __ASP_LOG_FUNC_END__); - if (g_client_info.is_registered == false) { - ASP_LOGE("Client is NOT registered"); - __ASP_LOG_FUNC_END__; - return ASP_ERROR_NOT_INITIALIZED; - } - - if (!session) { - ASP_LOGE("NULL handler!"); - __ASP_LOG_FUNC_END__; - return ASP_ERROR_INVALID_PARAMETER; - } ASP_LOGD("service [%p]", session); service = __get_session((void *)session); @@ -2767,18 +2456,10 @@ int asp_session_get_mac(asp_session_h session, char **session_mac) int res = ASP_ERROR_NONE; CHECK_FEATURE_SUPPORTED(TIZEN_FEATURE_ASP); + RET_ERR_IF_NOT_INITIALIZED(__ASP_LOG_FUNC_END__); + RET_ERR_IF_PARAMETER_IS_NOT_VALID(session, __ASP_LOG_FUNC_END__); + RET_ERR_IF_PARAMETER_IS_NOT_VALID(session_mac, __ASP_LOG_FUNC_END__); - if (g_client_info.is_registered == false) { - ASP_LOGE("Client is NOT registered"); - __ASP_LOG_FUNC_END__; - return ASP_ERROR_NOT_INITIALIZED; - } - - if (!session || !session_mac) { - ASP_LOGE("Invalid parameter!"); - __ASP_LOG_FUNC_END__; - return ASP_ERROR_INVALID_PARAMETER; - } ASP_LOGD("service [%p]", session); service = __get_session((void *)session); @@ -2804,18 +2485,10 @@ int asp_session_get_id(asp_session_h session, unsigned int *session_id) int res = ASP_ERROR_NONE; CHECK_FEATURE_SUPPORTED(TIZEN_FEATURE_ASP); + RET_ERR_IF_NOT_INITIALIZED(__ASP_LOG_FUNC_END__); + RET_ERR_IF_PARAMETER_IS_NOT_VALID(session, __ASP_LOG_FUNC_END__); + RET_ERR_IF_PARAMETER_IS_NOT_VALID(session_id, __ASP_LOG_FUNC_END__); - if (g_client_info.is_registered == false) { - ASP_LOGE("Client is NOT registered"); - __ASP_LOG_FUNC_END__; - return ASP_ERROR_NOT_INITIALIZED; - } - - if (!session || !session_id) { - ASP_LOGE("Invalid parameter!"); - __ASP_LOG_FUNC_END__; - return ASP_ERROR_INVALID_PARAMETER; - } ASP_LOGD("service [%p]", session); service = __get_session((void *)session); @@ -2841,14 +2514,11 @@ int asp_session_set_info(asp_session_h session, char *service_info) char *info = NULL; CHECK_FEATURE_SUPPORTED(TIZEN_FEATURE_ASP); + RET_ERR_IF_NOT_INITIALIZED(__ASP_LOG_FUNC_END__); + RET_ERR_IF_PARAMETER_IS_NOT_VALID(service_info, __ASP_LOG_FUNC_END__); + RET_ERR_IF_PARAMETER_IS_NOT_VALID(session, __ASP_LOG_FUNC_END__); - if (g_client_info.is_registered == false) { - ASP_LOGE("Client is NOT registered"); - __ASP_LOG_FUNC_END__; - return ASP_ERROR_NOT_INITIALIZED; - } - - if (!service_info || !session || strlen(service_info) > SESSION_INFO_LEN) { + if (strlen(service_info) > SESSION_INFO_LEN) { ASP_LOGE("NULL Param!"); __ASP_LOG_FUNC_END__; return ASP_ERROR_INVALID_PARAMETER; @@ -2883,18 +2553,9 @@ int asp_session_get_info(asp_session_h session, char **service_info) int res = ASP_ERROR_NONE; CHECK_FEATURE_SUPPORTED(TIZEN_FEATURE_ASP); - - if (g_client_info.is_registered == false) { - ASP_LOGE("Client is NOT registered"); - __ASP_LOG_FUNC_END__; - return ASP_ERROR_NOT_INITIALIZED; - } - - if (!session || !service_info) { - ASP_LOGE("NULL Param!"); - __ASP_LOG_FUNC_END__; - return ASP_ERROR_INVALID_PARAMETER; - } + RET_ERR_IF_NOT_INITIALIZED(__ASP_LOG_FUNC_END__); + RET_ERR_IF_PARAMETER_IS_NOT_VALID(service_info, __ASP_LOG_FUNC_END__); + RET_ERR_IF_PARAMETER_IS_NOT_VALID(session, __ASP_LOG_FUNC_END__); service = __get_session((void *)session); if (service == NULL) { @@ -2913,25 +2574,16 @@ int asp_session_get_info(asp_session_h session, char **service_info) } int asp_session_set_p2p_role_scheme(asp_session_h session, - asp_advert_p2p_role_scheme_e role) + asp_advert_p2p_role_scheme_e role) { __ASP_LOG_FUNC_START__; asp_client_session_s *service = NULL; int res = ASP_ERROR_NONE; CHECK_FEATURE_SUPPORTED(TIZEN_FEATURE_ASP); - - if (g_client_info.is_registered == false) { - ASP_LOGE("Client is NOT registered"); - __ASP_LOG_FUNC_END__; - return ASP_ERROR_NOT_INITIALIZED; - } - - if (!role || !session) { - ASP_LOGE("Invalid parameters"); - __ASP_LOG_FUNC_END__; - return ASP_ERROR_INVALID_PARAMETER; - } + RET_ERR_IF_NOT_INITIALIZED(__ASP_LOG_FUNC_END__); + RET_ERR_IF_PARAMETER_IS_NOT_VALID(session, __ASP_LOG_FUNC_END__); + RET_ERR_IF_PARAMETER_IS_NOT_VALID(role, __ASP_LOG_FUNC_END__); service = __get_session((void *)session); if (service == NULL) { @@ -2949,25 +2601,16 @@ int asp_session_set_p2p_role_scheme(asp_session_h session, } int asp_session_get_p2p_role_scheme(asp_session_h session, - asp_advert_p2p_role_scheme_e *role) + asp_advert_p2p_role_scheme_e *role) { __ASP_LOG_FUNC_START__; asp_client_session_s *service = NULL; int res = ASP_ERROR_NONE; CHECK_FEATURE_SUPPORTED(TIZEN_FEATURE_ASP); - - if (g_client_info.is_registered == false) { - ASP_LOGE("Client is NOT registered"); - __ASP_LOG_FUNC_END__; - return ASP_ERROR_NOT_INITIALIZED; - } - - if (!role || !session) { - ASP_LOGE("Invalid parameters"); - __ASP_LOG_FUNC_END__; - return ASP_ERROR_INVALID_PARAMETER; - } + RET_ERR_IF_NOT_INITIALIZED(__ASP_LOG_FUNC_END__); + RET_ERR_IF_PARAMETER_IS_NOT_VALID(session, __ASP_LOG_FUNC_END__); + RET_ERR_IF_PARAMETER_IS_NOT_VALID(role, __ASP_LOG_FUNC_END__); service = __get_session((void *)session); if (service == NULL) { @@ -2985,25 +2628,15 @@ int asp_session_get_p2p_role_scheme(asp_session_h session, } int asp_session_set_p2p_config_method(asp_session_h session, - asp_wps_type_e config_method) + asp_wps_type_e config_method) { __ASP_LOG_FUNC_START__; asp_client_session_s *service = NULL; int res = ASP_ERROR_NONE; CHECK_FEATURE_SUPPORTED(TIZEN_FEATURE_ASP); - - if (g_client_info.is_registered == false) { - ASP_LOGE("Client is NOT registered"); - __ASP_LOG_FUNC_END__; - return ASP_ERROR_NOT_INITIALIZED; - } - - if (!session) { - ASP_LOGE("Invalid parameter"); - __ASP_LOG_FUNC_END__; - return ASP_ERROR_INVALID_PARAMETER; - } + RET_ERR_IF_NOT_INITIALIZED(__ASP_LOG_FUNC_END__); + RET_ERR_IF_PARAMETER_IS_NOT_VALID(session, __ASP_LOG_FUNC_END__); service = __get_session((void *)session); if (service == NULL) { @@ -3028,25 +2661,16 @@ int asp_session_set_p2p_config_method(asp_session_h session, } int asp_session_get_p2p_config_method(asp_session_h session, - asp_wps_type_e *config_method) + asp_wps_type_e *config_method) { __ASP_LOG_FUNC_START__; asp_client_session_s *service = NULL; int res = ASP_ERROR_NONE; CHECK_FEATURE_SUPPORTED(TIZEN_FEATURE_ASP); - - if (g_client_info.is_registered == false) { - ASP_LOGE("Client is NOT registered"); - __ASP_LOG_FUNC_END__; - return ASP_ERROR_NOT_INITIALIZED; - } - - if (!config_method || !session) { - ASP_LOGE("Invalid parameters"); - __ASP_LOG_FUNC_END__; - return ASP_ERROR_INVALID_PARAMETER; - } + RET_ERR_IF_NOT_INITIALIZED(__ASP_LOG_FUNC_END__); + RET_ERR_IF_PARAMETER_IS_NOT_VALID(session, __ASP_LOG_FUNC_END__); + RET_ERR_IF_PARAMETER_IS_NOT_VALID(config_method, __ASP_LOG_FUNC_END__); service = __get_session((void *)session); if (service == NULL) { @@ -3070,18 +2694,9 @@ int asp_session_get_close_status(asp_session_h session, int *status) int res = ASP_ERROR_NONE; CHECK_FEATURE_SUPPORTED(TIZEN_FEATURE_ASP); - - if (g_client_info.is_registered == false) { - ASP_LOGE("Client is NOT registered"); - __ASP_LOG_FUNC_END__; - return ASP_ERROR_NOT_INITIALIZED; - } - - if (!status || !session) { - ASP_LOGE("Invalid parameters"); - __ASP_LOG_FUNC_END__; - return ASP_ERROR_INVALID_PARAMETER; - } + RET_ERR_IF_NOT_INITIALIZED(__ASP_LOG_FUNC_END__); + RET_ERR_IF_PARAMETER_IS_NOT_VALID(session, __ASP_LOG_FUNC_END__); + RET_ERR_IF_PARAMETER_IS_NOT_VALID(status, __ASP_LOG_FUNC_END__); service = __get_session((void *)session); if (service == NULL) { @@ -3109,18 +2724,8 @@ int asp_session_connect(asp_session_h session) int ret = ASP_ERROR_NONE; CHECK_FEATURE_SUPPORTED(TIZEN_FEATURE_ASP); - - if (g_client_info.is_registered == false) { - ASP_LOGE("Client is NOT registered"); - __ASP_LOG_FUNC_END__; - return ASP_ERROR_NOT_INITIALIZED; - } - - if (!session) { - ASP_LOGE("NULL Param!"); - __ASP_LOG_FUNC_END__; - return ASP_ERROR_INVALID_PARAMETER; - } + RET_ERR_IF_NOT_INITIALIZED(__ASP_LOG_FUNC_END__); + RET_ERR_IF_PARAMETER_IS_NOT_VALID(session, __ASP_LOG_FUNC_END__); service = __get_session((void *)session); if (service == NULL) { @@ -3173,18 +2778,8 @@ int asp_session_confirm(asp_session_h session, bool confirmed, char *pin) int ret = ASP_ERROR_NONE; CHECK_FEATURE_SUPPORTED(TIZEN_FEATURE_ASP); - - if (g_client_info.is_registered == false) { - ASP_LOGE("Client is NOT registered"); - __ASP_LOG_FUNC_END__; - return ASP_ERROR_NOT_INITIALIZED; - } - - if (!session) { - ASP_LOGE("NULL Param!"); - __ASP_LOG_FUNC_END__; - return ASP_ERROR_INVALID_PARAMETER; - } + RET_ERR_IF_NOT_INITIALIZED(__ASP_LOG_FUNC_END__); + RET_ERR_IF_PARAMETER_IS_NOT_VALID(session, __ASP_LOG_FUNC_END__); service = __get_session((void *)session); if (service == NULL) { @@ -3221,7 +2816,7 @@ int asp_session_confirm(asp_session_h session, bool confirmed, char *pin) } int asp_session_get_handle(char *session_mac, unsigned int session_id, - asp_session_h *session) + asp_session_h *session) { __ASP_LOG_FUNC_START__; @@ -3235,18 +2830,9 @@ int asp_session_get_handle(char *session_mac, unsigned int session_id, int ret = ASP_ERROR_NONE; CHECK_FEATURE_SUPPORTED(TIZEN_FEATURE_ASP); - - if (g_client_info.is_registered == false) { - ASP_LOGE("Client is NOT registered"); - __ASP_LOG_FUNC_END__; - return ASP_ERROR_NOT_INITIALIZED; - } - - if (!session_mac || !session) { - ASP_LOGE("NULL Param!"); - __ASP_LOG_FUNC_END__; - return ASP_ERROR_INVALID_PARAMETER; - } + RET_ERR_IF_NOT_INITIALIZED(__ASP_LOG_FUNC_END__); + RET_ERR_IF_PARAMETER_IS_NOT_VALID(session, __ASP_LOG_FUNC_END__); + RET_ERR_IF_PARAMETER_IS_NOT_VALID(session_mac, __ASP_LOG_FUNC_END__); params = g_variant_new("(su)", session_mac, session_id); reply = asp_dbus_method_call_sync(ASP_DAEMON_SESSION_INTERFACE, @@ -3317,18 +2903,8 @@ int asp_session_set_state_ready(asp_session_h session) int ret = ASP_ERROR_NONE; CHECK_FEATURE_SUPPORTED(TIZEN_FEATURE_ASP); - - if (g_client_info.is_registered == false) { - ASP_LOGE("Client is NOT registered"); - __ASP_LOG_FUNC_END__; - return ASP_ERROR_NOT_INITIALIZED; - } - - if (!session) { - ASP_LOGE("NULL Param!"); - __ASP_LOG_FUNC_END__; - return ASP_ERROR_INVALID_PARAMETER; - } + RET_ERR_IF_NOT_INITIALIZED(__ASP_LOG_FUNC_END__); + RET_ERR_IF_PARAMETER_IS_NOT_VALID(session, __ASP_LOG_FUNC_END__); service = __get_session((void *)session); if (service == NULL) { @@ -3368,18 +2944,8 @@ int asp_session_close(asp_session_h session) int ret = ASP_ERROR_NONE; CHECK_FEATURE_SUPPORTED(TIZEN_FEATURE_ASP); - - if (g_client_info.is_registered == false) { - ASP_LOGE("Client is NOT registered"); - __ASP_LOG_FUNC_END__; - return ASP_ERROR_NOT_INITIALIZED; - } - - if (!session) { - ASP_LOGE("NULL Param!"); - __ASP_LOG_FUNC_END__; - return ASP_ERROR_INVALID_PARAMETER; - } + RET_ERR_IF_NOT_INITIALIZED(__ASP_LOG_FUNC_END__); + RET_ERR_IF_PARAMETER_IS_NOT_VALID(session, __ASP_LOG_FUNC_END__); service = __get_session((void *)session); if (service == NULL) { @@ -3409,7 +2975,7 @@ int asp_session_close(asp_session_h session) } int asp_session_bind_port(asp_session_h session, char *ip_address, - int port, int proto) + int port, int proto) { __ASP_LOG_FUNC_START__; GVariantBuilder *builder = NULL; @@ -3420,18 +2986,9 @@ int asp_session_bind_port(asp_session_h session, char *ip_address, int ret = ASP_ERROR_NONE; CHECK_FEATURE_SUPPORTED(TIZEN_FEATURE_ASP); - - if (g_client_info.is_registered == false) { - ASP_LOGE("Client is NOT registered"); - __ASP_LOG_FUNC_END__; - return ASP_ERROR_NOT_INITIALIZED; - } - - if (!session || !ip_address) { - ASP_LOGE("NULL Param!"); - __ASP_LOG_FUNC_END__; - return ASP_ERROR_INVALID_PARAMETER; - } + RET_ERR_IF_NOT_INITIALIZED(__ASP_LOG_FUNC_END__); + RET_ERR_IF_PARAMETER_IS_NOT_VALID(session, __ASP_LOG_FUNC_END__); + RET_ERR_IF_PARAMETER_IS_NOT_VALID(ip_address, __ASP_LOG_FUNC_END__); service = __get_session((void *)session); if (service == NULL) { @@ -3468,7 +3025,7 @@ int asp_session_bind_port(asp_session_h session, char *ip_address, } int asp_session_release_port(asp_session_h session, char *ip_address, - int port, int proto) + int port, int proto) { __ASP_LOG_FUNC_START__; GVariantBuilder *builder = NULL; @@ -3479,18 +3036,9 @@ int asp_session_release_port(asp_session_h session, char *ip_address, int ret = ASP_ERROR_NONE; CHECK_FEATURE_SUPPORTED(TIZEN_FEATURE_ASP); - - if (g_client_info.is_registered == false) { - ASP_LOGE("Client is NOT registered"); - __ASP_LOG_FUNC_END__; - return ASP_ERROR_NOT_INITIALIZED; - } - - if (!session || !ip_address) { - ASP_LOGE("NULL Param!"); - __ASP_LOG_FUNC_END__; - return ASP_ERROR_INVALID_PARAMETER; - } + RET_ERR_IF_NOT_INITIALIZED(__ASP_LOG_FUNC_END__); + RET_ERR_IF_PARAMETER_IS_NOT_VALID(session, __ASP_LOG_FUNC_END__); + RET_ERR_IF_PARAMETER_IS_NOT_VALID(ip_address, __ASP_LOG_FUNC_END__); service = __get_session((void *)session); if (service == NULL) { diff --git a/src/include/asp-util.h b/src/include/asp-util.h index a7d22fe..56cc672 100755 --- a/src/include/asp-util.h +++ b/src/include/asp-util.h @@ -59,4 +59,22 @@ } \ } while (0) +#define RET_ERR_IF_PARAMETER_IS_NOT_VALID(arg, release)\ + do {\ + if (!(arg)) {\ + ASP_LOGE("Invalid parameter");\ + release;\ + return ASP_ERROR_INVALID_PARAMETER;\ + }\ + } while(0) + +#define RET_ERR_IF_NOT_INITIALIZED(release)\ + do {\ + if (g_client_info.is_registered) {\ + ASP_LOGE("Client is not initialized.");\ + release;\ + return ASP_ERROR_NOT_INITIALIZED;\ + }\ + } while(0) + #endif /** __ASP_UTIL_H__ */