Remove duplicated code using __handle_dbus_request_result function

Change-Id: Ic11f9694ad4f952d70e95961c0dc9c708e3c76bb
Signed-off-by: Suyeon Hwang <stom.hwang@samsung.com>

diff --git a/client/tts_core.c b/client/tts_core.c
index 97054d782f66caca4d824de339f464e41e6c0685..77b88604b672eedba6da07039abfa75bef127e72 100644 (file)
--- a/client/tts_core.c
+++ b/client/tts_core.c
@@ -1456,30 +1456,13 @@ int tts_core_set_private_data(tts_client_s* client, const char* key, const char*
        int ret = -1;
        int count = 0;
        bool is_prepared = false;
-       while (0 != ret) {
+       while (TTS_RETRY_COUNT > count) {
                ret = tts_ipc_request_set_private_data(uid, key, data);
-               if (0 != ret) {
-                       //LCOV_EXCL_START
-                       if (TTS_ERROR_INVALID_PARAMETER == ret && false == is_prepared) {
-                               tts_client_set_current_state(client, TTS_STATE_CREATED);
-                               if (0 == tts_core_prepare_sync(client)) {
-                                       is_prepared = true;
-                                       SLOG(LOG_INFO, TAG_TTSC, "[INFO] Success tts_prepare_sync");
-                               }
-                       } else if (TTS_ERROR_TIMED_OUT != ret) {
-                               SLOG(LOG_ERROR, TAG_TTSC, "[ERROR] result : %s", __tts_get_error_code(ret));
-                               return ret;
-                       } else {
-                               SLOG(LOG_WARN, TAG_TTSC, "[WARNING] retry : %s", __tts_get_error_code(ret));
-                               usleep(10000);
-                               count++;
-                               if (TTS_RETRY_COUNT == count) {
-                                       SLOG(LOG_ERROR, TAG_TTSC, "[ERROR] Fail to request");
-                                       return ret;
-                               }
-                       }
-                       //LCOV_EXCL_STOP
+               if (false == __handle_dbus_request_result(client, ret, &is_prepared)) {
+                       break;
                }
+
+               count++;
        }
 
        if (TTS_ERROR_NONE != ret) {
@@ -1502,30 +1485,13 @@ int tts_core_get_private_data(tts_client_s* client, const char* key, char** data
        int ret = -1;
        int count = 0;
        bool is_prepared = false;
-       while (0 != ret) {
+       while (TTS_RETRY_COUNT > count) {
                ret = tts_ipc_request_get_private_data(uid, key, data);
-               if (0 != ret) {
-                       //LCOV_EXCL_START
-                       if (TTS_ERROR_INVALID_PARAMETER == ret && false == is_prepared) {
-                               tts_client_set_current_state(client, TTS_STATE_CREATED);
-                               if (0 == tts_core_prepare_sync(client)) {
-                                       is_prepared = true;
-                                       SLOG(LOG_INFO, TAG_TTSC, "[INFO] Success tts_prepare_sync");
-                               }
-                       } else if (TTS_ERROR_TIMED_OUT != ret) {
-                               SLOG(LOG_ERROR, TAG_TTSC, "[ERROR] result : %s", __tts_get_error_code(ret));
-                               return ret;
-                       } else {
-                               SLOG(LOG_WARN, TAG_TTSC, "[WARNING] retry : %s", __tts_get_error_code(ret));
-                               usleep(10000);
-                               count++;
-                               if (TTS_RETRY_COUNT == count) {
-                                       SLOG(LOG_ERROR, TAG_TTSC, "[ERROR] Fail to request");
-                                       return ret;
-                               }
-                       }
-                       //LCOV_EXCL_STOP
+               if (false == __handle_dbus_request_result(client, ret, &is_prepared)) {
+                       break;
                }
+
+               count++;
        }
 
        if (TTS_ERROR_NONE != ret) {