Refactor duplicate codes #2

Change-Id: Id61f1dab59b74a7dd90d9fd4fd65d9470dd3aa53
Signed-off-by: Taesub Kim <taesub.kim@samsung.com>

diff --git a/src/asp-client.c b/src/asp-client.c
index 6b5b17a..4c32f4a 100755 (executable)
--- a/src/asp-client.c
+++ b/src/asp-client.c
@@ -1487,9 +1487,9 @@ int asp_advert_add_info(asp_advert_service_h adv_service,
        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__);
        RET_ERR_IF_PARAMETER_IS_NOT_VALID(key, __ASP_LOG_FUNC_END__);
-       RET_ERR_IF_NOT_INITIALIZED(__ASP_LOG_FUNC_END__);
 
        ASP_LOGD("service [%p]", adv_service);
 
@@ -1522,9 +1522,9 @@ int asp_advert_get_info(asp_advert_service_h adv_service, const char *key,
        char *ret_val = 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__);
        RET_ERR_IF_PARAMETER_IS_NOT_VALID(key, __ASP_LOG_FUNC_END__);
-       RET_ERR_IF_NOT_INITIALIZED(__ASP_LOG_FUNC_END__);
 
        ASP_LOGD("service [%p]", adv_service);
 
@@ -1557,9 +1557,9 @@ 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_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(key, __ASP_LOG_FUNC_END__);
-       RET_ERR_IF_NOT_INITIALIZED(__ASP_LOG_FUNC_END__);
 
        ASP_LOGD("service [%p]", adv_service);
 
@@ -2147,7 +2147,6 @@ int asp_seek_add_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__);
@@ -2218,7 +2217,6 @@ int asp_seek_set_discovery_tech(asp_seek_service_h seek_service, int discovery_t
        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__);
 

diff --git a/src/include/asp-util.h b/src/include/asp-util.h
index 56cc672..06cce3c 100755 (executable)
--- a/src/include/asp-util.h
+++ b/src/include/asp-util.h
@@ -70,7 +70,7 @@
 
 #define RET_ERR_IF_NOT_INITIALIZED(release)\
        do {\
-               if (g_client_info.is_registered) {\
+               if (!(g_client_info.is_registered)) {\
                        ASP_LOGE("Client is not initialized.");\
                        release;\
                        return ASP_ERROR_NOT_INITIALIZED;\