Fix prototypes of internal functions to increase readability

Some internal functions are not declared as a static. Using static keyword, each functions can
avoid the access from out of file.
And also, some functions have too many parameters and it makes difficult to use.

This patch adds static keywords to internal functions and simplify some internal function.

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

diff --git a/server/ttsd_data.cpp b/server/ttsd_data.cpp
index 3751550..71baa77 100644 (file)
--- a/server/ttsd_data.cpp
+++ b/server/ttsd_data.cpp
@@ -68,9 +68,8 @@ static void __data_show_list()
 
        SLOG(LOG_DEBUG, tts_tag(), "-----------------------");
 }
-#endif
 
-int __data_show_sound_list(app_data_s& app_data)
+static void __data_show_sound_list(app_data_s& app_data)
 {
        SLOG(LOG_DEBUG, tts_tag(), "----- Sound list -----");
 
@@ -86,10 +85,9 @@ int __data_show_sound_list(app_data_s& app_data)
        }
 
        SLOG(LOG_DEBUG, tts_tag(), "----------------------");
-       return TTSD_ERROR_NONE;
 }
 
-int __data_show_text_list(app_data_s& app_data)
+static void __data_show_text_list(app_data_s& app_data)
 {
        SLOG(LOG_DEBUG, tts_tag(), "----- Text list -----");
 
@@ -105,10 +103,9 @@ int __data_show_text_list(app_data_s& app_data)
        }
 
        SLOG(LOG_DEBUG, tts_tag(), "---------------------");
-       return TTSD_ERROR_NONE;
 }
 
-int __data_show_used_voice_list(app_data_s& app_data)
+static void __data_show_used_voice_list(app_data_s& app_data)
 {
        SLOG(LOG_DEBUG, tts_tag(), "----- Used voice list -----");
 
@@ -123,8 +120,8 @@ int __data_show_used_voice_list(app_data_s& app_data)
        }
 
        SLOG(LOG_DEBUG, tts_tag(), "---------------------------");
-       return TTSD_ERROR_NONE;
 }
+#endif
 
 /*
 * ttsd data functions
@@ -534,22 +531,20 @@ int ttsd_data_add_speak_data(unsigned int uid, speak_data_s* data)
        return TTSD_ERROR_NONE;
 }
 
-int __get_speak_data(app_data_s* app_data, speak_data_s** data)
+static speak_data_s* __get_speak_data(app_data_s* app_data)
 {
        if (app_data->m_speak_data.empty()) {
 #ifdef DATA_DEBUG
                SLOG(LOG_WARN, tts_tag(), "[DATA WARNING] There is no speak data");
 #endif
-               return -1;
+               return nullptr;
        }
 
-       *data = app_data->m_speak_data.front();
-       app_data->m_speak_data.pop_front();
-
 #ifdef DATA_DEBUG
        __data_show_text_list(*app_data);
 #endif
-       return 0;
+
+       return app_data->m_speak_data.front();
 }
 
 int ttsd_data_get_speak_data(unsigned int uid, speak_data_s** data)
@@ -561,11 +556,15 @@ int ttsd_data_get_speak_data(unsigned int uid, speak_data_s** data)
                return TTSD_ERROR_INVALID_PARAMETER;
        }
 
-       if (0 != __get_speak_data(app_data, data)) {
+       speak_data_s* speakData = __get_speak_data(app_data);
+       if (nullptr == speakData) {
                SLOG(LOG_WARN, tts_tag(), "[DATA WARNING] There is no speak data");
-               return -1;
+               return TTSD_ERROR_OPERATION_FAILED;
        }
 
+       app_data->m_speak_data.pop_front();
+       *data = speakData;
+
        return TTSD_ERROR_NONE;
 }
 
@@ -649,22 +648,20 @@ int ttsd_data_add_sound_data(unsigned int uid, sound_data_s* data)
        return TTSD_ERROR_NONE;
 }
 
-int __get_sound_data(app_data_s* app_data, sound_data_s** data)
+static sound_data_s* __get_sound_data(app_data_s* app_data)
 {
        if (app_data->m_wav_data.empty()) {
 #ifdef DATA_DEBUG
                SLOG(LOG_DEBUG, tts_tag(), "[DATA] There is no wav data");
 #endif
-               return -1;
+               return nullptr;
        }
 
-       *data = app_data->m_wav_data.front();
-       app_data->m_wav_data.pop_front();
-
 #ifdef DATA_DEBUG
        __data_show_sound_list(*app_data);
 #endif
-       return 0;
+
+       return app_data->m_wav_data.front();
 }
 
 int ttsd_data_get_sound_data(unsigned int uid, sound_data_s** data)
@@ -678,11 +675,15 @@ int ttsd_data_get_sound_data(unsigned int uid, sound_data_s** data)
                return TTSD_ERROR_INVALID_PARAMETER;
        }
 
-       if (0 != __get_sound_data(app_data, data)) {
+       sound_data_s* soundData = __get_sound_data(app_data);
+       if (nullptr == soundData) {
                SLOG(LOG_DEBUG, tts_tag(), "[DATA] There is no wav data");
-               return -1;
+               return TTSD_ERROR_OPERATION_FAILED;
        }
 
+       app_data->m_wav_data.pop_front();
+       *data = soundData;
+
        return TTSD_ERROR_NONE;
 }