Clean code to enhance readability

This patch includes these changes.
- Remove unvaluable parameter from 'ttsd_data_clear_speak_data()'
- Change NULL to nullptr to unify the coding style of file

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

diff --git a/server/ttsd_data.cpp b/server/ttsd_data.cpp
index b69dfd598a53dae841d2974b8b0ee27f7566ba0c..94604fac905dee0f361a6e9f398b58af91686e80 100644 (file)
--- a/server/ttsd_data.cpp
+++ b/server/ttsd_data.cpp
@@ -378,22 +378,22 @@ int ttsd_data_reset_used_voice(int uid, ttsd_used_voice_cb callback)
                return TTSD_ERROR_INVALID_PARAMETER;
        }
 
-       if (NULL == callback) {
-               SLOG(LOG_WARN, tts_tag(), "[DATA WARNING] Used voice callback is NULL");
+       if (nullptr == callback) {
+               SLOG(LOG_WARN, tts_tag(), "[DATA WARNING] Used voice callback is nullptr");
        }
 
        /* Find voice */
        list<used_voice_s>& usedVoices = app_data->m_used_voice;
        for (auto& voice : usedVoices) {
-               if (NULL != callback) {
+               if (nullptr != callback) {
                        lock.unlock();
                        callback(voice.lang, voice.vctype);
                        lock.lock();
                }
 
-               if (NULL != voice.lang) {
+               if (nullptr != voice.lang) {
                        free(voice.lang);
-                       voice.lang = NULL;
+                       voice.lang = nullptr;
                }
        }
        usedVoices.clear();
@@ -482,8 +482,8 @@ int ttsd_data_add_sound_data(int uid, sound_data_s* data)
                return TTSD_ERROR_INVALID_PARAMETER;
        }
 
-       if (NULL == data) {
-               SLOG(LOG_ERROR, tts_tag(), "[DATA ERROR] sound data is NULL");
+       if (nullptr == data) {
+               SLOG(LOG_ERROR, tts_tag(), "[DATA ERROR] sound data is nullptr");
                return TTSD_ERROR_INVALID_PARAMETER;
        }
 
@@ -556,30 +556,28 @@ int ttsd_data_get_sound_data_size(int uid)
        return app_data->m_wav_data.size();
 }
 
-int ttsd_data_clear_speak_data(int uid, speak_data_s** speak_data)
+int ttsd_data_clear_speak_data(speak_data_s** speak_data)
 {
-       lock_guard<mutex> lock(g_app_data_mutex);
-       app_data_s* app_data = __get_client_app_data(uid);
-       if (nullptr == app_data) {
-               SECURE_SLOG(LOG_ERROR, tts_tag(), "[DATA ERROR] uid is not valid (%d)", uid);
+       if (nullptr == speak_data) {
+               SECURE_SLOG(LOG_ERROR, tts_tag(), "[DATA ERROR] speak_data is nullptr");
                return TTSD_ERROR_INVALID_PARAMETER;
        }
 
-       if (NULL != *speak_data) {
+       if (nullptr != *speak_data) {
                SLOG(LOG_DEBUG, tts_tag(), "[DEBUG] utt(%d), text(%s), lang(%s), vctype(%d) speed(%d)",
                                (*speak_data)->utt_id, (*speak_data)->text, (*speak_data)->lang, (*speak_data)->vctype, (*speak_data)->speed);
 
-               if (NULL != (*speak_data)->text) {
+               if (nullptr != (*speak_data)->text) {
                        free((*speak_data)->text);
-                       (*speak_data)->text = NULL;
+                       (*speak_data)->text = nullptr;
                }
-               if (NULL != (*speak_data)->lang) {
+               if (nullptr != (*speak_data)->lang) {
                        free((*speak_data)->lang);
-                       (*speak_data)->lang = NULL;
+                       (*speak_data)->lang = nullptr;
                }
 
                free(*speak_data);
-               *speak_data = NULL;
+               *speak_data = nullptr;
        }
 
        return TTSD_ERROR_NONE;
@@ -587,17 +585,22 @@ int ttsd_data_clear_speak_data(int uid, speak_data_s** speak_data)
 
 int ttsd_data_clear_sound_data(sound_data_s** sound_data)
 {
-       if (NULL != *sound_data) {
+       if (nullptr == sound_data) {
+               SECURE_SLOG(LOG_ERROR, tts_tag(), "[DATA ERROR] sound_data is nullptr");
+               return TTSD_ERROR_INVALID_PARAMETER;
+       }
+
+       if (nullptr != *sound_data) {
                SLOG(LOG_ERROR, tts_tag(), "[DEBUG][%p] event(%d) data(%p) size(%d) rate(%d) utt(%d)",
                                (*sound_data), (*sound_data)->event, (*sound_data)->data, (*sound_data)->data_size, (*sound_data)->rate, (*sound_data)->utt_id);
 
-               if (NULL != (*sound_data)->data) {
+               if (nullptr != (*sound_data)->data) {
                        free((*sound_data)->data);
-                       (*sound_data)->data = NULL;
+                       (*sound_data)->data = nullptr;
                }
 
                free(*sound_data);
-               *sound_data = NULL;
+               *sound_data = nullptr;
        }
 
        return TTSD_ERROR_NONE;
@@ -678,8 +681,8 @@ int ttsd_data_get_current_playing()
 
 int ttsd_data_foreach_clients(ttsd_data_get_client_cb callback, void* user_data)
 {
-       if (NULL == callback) {
-               SLOG(LOG_ERROR, tts_tag(), "[DATA ERROR] input data is NULL!!");
+       if (nullptr == callback) {
+               SLOG(LOG_ERROR, tts_tag(), "[DATA ERROR] input data is nullptr!!");
                return -1;
        }
 

diff --git a/server/ttsd_data.h b/server/ttsd_data.h
index f5899fff82524c1d85f9c04167ccfce419979761..cdc3861033b7c8b63c71a89f6df69eed80ad8a14 100644 (file)
--- a/server/ttsd_data.h
+++ b/server/ttsd_data.h
@@ -83,7 +83,7 @@ int ttsd_data_get_speak_data(int uid, speak_data_s** data);
 
 int ttsd_data_get_speak_data_size(int uid);
 
-int ttsd_data_clear_speak_data(int uid, speak_data_s** speak_data);
+int ttsd_data_clear_speak_data(speak_data_s** speak_data);
 
 /* sound data */
 int ttsd_data_add_sound_data(int uid, sound_data_s* data);

diff --git a/server/ttsd_server.c b/server/ttsd_server.c
index 892095bb63fd7344c97cf31fbe261ab5b4010c71..b32d1a20cb4d2b6e11d16ded08cfb570928922a6 100644 (file)
--- a/server/ttsd_server.c
+++ b/server/ttsd_server.c
@@ -102,7 +102,7 @@ static int __synthesis(int uid, const char* credential)
 
                        ttsdc_ipc_send_set_state_message(pid, uid, APP_STATE_READY);
 
-                       ttsd_data_clear_speak_data(uid, &speak_data);
+                       ttsd_data_clear_speak_data(&speak_data);
 
                        return 0;
                }
@@ -137,9 +137,9 @@ static int __synthesis(int uid, const char* credential)
                        g_wait_timer = ecore_timer_add(0.05, __wait_synthesis, (void*)credential);
                }
 
-               ttsd_data_clear_speak_data(uid, &speak_data);
+               ttsd_data_clear_speak_data(&speak_data);
        } else {
-               ttsd_data_clear_speak_data(uid, &speak_data);
+               ttsd_data_clear_speak_data(&speak_data);
        }
 
        SLOG(LOG_DEBUG, tts_tag(), "@@@ SYNTHESIS  END");