Remove duplicated codes

Change-Id: I8a9b6e53fa371936b50bcfe749ade2dc85c12508

diff --git a/client/stt_dbus.c b/client/stt_dbus.c
index 1ab6b2e..7593bde 100644 (file)
--- a/client/stt_dbus.c
+++ b/client/stt_dbus.c
@@ -1458,14 +1458,8 @@ int stt_dbus_request_is_recognition_type_supported(unsigned int uid, const char*
        return result;
 }
 
-static int __stt_dbus_request_set_sound(int method, unsigned int uid, const char* file)
+DBusMessage* __stt_dbus_create_message(char* method_string)
 {
-       if (NULL == file) {
-               SLOG(LOG_ERROR, TAG_STTC, "Input parameter is NULL"); //LCOV_EXCL_LINE
-               return STT_ERROR_INVALID_PARAMETER;
-       }
-       char* method_string = __convert_stt_set_sound_method_into_char(method);
-
        DBusMessage* msg;
 
        msg = dbus_message_new_method_call(
@@ -1476,8 +1470,20 @@ static int __stt_dbus_request_set_sound(int method, unsigned int uid, const char
 
        if (NULL == msg) {
                SLOG(LOG_ERROR, TAG_STTC, ">>>> %s : Fail to make message", method_string); //LCOV_EXCL_LINE
-               return STT_ERROR_OPERATION_FAILED;
-       } else {
+       }
+       return msg;
+}
+
+static int __stt_dbus_request_set_sound(stt_set_sound_method_e method, unsigned int uid, const char* file)
+{
+       if (NULL == file) {
+               SLOG(LOG_ERROR, TAG_STTC, "Input parameter is NULL"); //LCOV_EXCL_LINE
+               return STT_ERROR_INVALID_PARAMETER;
+       }
+
+       char* method_string = __convert_stt_set_sound_method_into_char(method);
+       DBusMessage* msg = __stt_dbus_create_message(method_string);
+       if (NULL != msg) {
                SLOG(LOG_DEBUG, TAG_STTC, ">>>> %s : uid(%u) file(%s)", method_string, uid, file);
        }
 
@@ -1490,21 +1496,11 @@ static int __stt_dbus_request_set_sound(int method, unsigned int uid, const char
        return result;
 }
 
-static int __stt_dbus_request_unset_sound(int method, unsigned int uid)
+static int __stt_dbus_request_unset_sound(stt_set_sound_method_e method, unsigned int uid)
 {
-       DBusMessage* msg;
        char* method_string = __convert_stt_set_sound_method_into_char(method);
-
-       msg = dbus_message_new_method_call(
-               g_server_service_name,
-               g_server_service_object,
-               g_server_service_interface,
-               method_string);
-
-       if (NULL == msg) {
-               SLOG(LOG_ERROR, TAG_STTC, ">>>> %s : Fail to make message", method_string); //LCOV_EXCL_LINE
-               return STT_ERROR_OPERATION_FAILED;
-       } else {
+       DBusMessage* msg = __stt_dbus_create_message(method_string);
+       if (NULL != msg) {
                SLOG(LOG_DEBUG, TAG_STTC, ">>>> %s : uid(%u)", method_string, uid);
        }
 
@@ -1518,6 +1514,8 @@ static int __stt_dbus_request_unset_sound(int method, unsigned int uid)
 
 int stt_dbus_request_set_start_sound(unsigned int uid, const char* file)
 {
+       SLOG(LOG_DEBUG, TAG_STTC, "Request to set start sound, uid(%d), file(%s)", uid, file);
+
        int ret = __stt_dbus_request_set_sound(STT_SET_START_SOUND, uid, file);
        if (STT_ERROR_NONE != ret) {
                SLOG(LOG_ERROR, TAG_STTC, "Fail to request set start sound, uid(%d), file(%s)", uid, file);
@@ -1528,6 +1526,8 @@ int stt_dbus_request_set_start_sound(unsigned int uid, const char* file)
 
 int stt_dbus_request_unset_start_sound(unsigned int uid)
 {
+       SLOG(LOG_DEBUG, TAG_STTC, "Request to unset start sound, uid(%d)", uid);
+
        int ret = __stt_dbus_request_unset_sound(STT_UNSET_START_SOUND, uid);
        if (STT_ERROR_NONE != ret) {
                SLOG(LOG_ERROR, TAG_STTC, "Fail to request unset start sound, uid(%d)", uid);
@@ -1538,6 +1538,8 @@ int stt_dbus_request_unset_start_sound(unsigned int uid)
 
 int stt_dbus_request_set_stop_sound(unsigned int uid, const char* file)
 {
+       SLOG(LOG_DEBUG, TAG_STTC, "Request to set stop sound, uid(%d), file(%s)", uid, file);
+
        int ret = __stt_dbus_request_set_sound(STT_SET_STOP_SOUND, uid, file);
        if (STT_ERROR_NONE != ret) {
                SLOG(LOG_ERROR, TAG_STTC, "Fail to request set stop sound, uid(%d), file(%s)", uid, file);
@@ -1548,6 +1550,8 @@ int stt_dbus_request_set_stop_sound(unsigned int uid, const char* file)
 
 int stt_dbus_request_unset_stop_sound(unsigned int uid)
 {
+       SLOG(LOG_DEBUG, TAG_STTC, "Request to unset stop sound, uid(%d)", uid);
+
        int ret = __stt_dbus_request_unset_sound(STT_UNSET_STOP_SOUND, uid);
        if (STT_ERROR_NONE != ret) {
                SLOG(LOG_ERROR, TAG_STTC, "Fail to request unset stop sound, uid(%d)", uid);