Merge "Add to check if app agreed or not" into tizen

diff --git a/server/ttsd_server.c b/server/ttsd_server.c
index c49a7bd..f494287 100644 (file)
--- a/server/ttsd_server.c
+++ b/server/ttsd_server.c
@@ -179,7 +179,7 @@ int ttsd_send_error(ttse_error_e error, const char* msg)
        int uttid = g_utt.uttid;
        int tmp_pid = ttsd_data_get_pid(uid);
 
-       SLOG(LOG_ERROR, tts_tag(), "[SERVER ERROR] Error msg from engine, pid(%d), uid(%d), uttid(%d), error(%d), msg(%s)", tmp_pid, uid, uttid, error, msg);
+       SLOG(LOG_ERROR, tts_tag(), "[SERVER ERROR] Error msg from engine, pid(%d), uid(%d), uttid(%d), error(%d), msg(%s)", tmp_pid, uid, uttid, error, (NULL == msg ? "NULL" : msg));
 
        __server_set_synth_control(TTSD_SYNTHESIS_CONTROL_EXPIRED);
 

diff --git a/server/ttse.c b/server/ttse.c
index 0e8ee96..5dd4071 100755 (executable)
--- a/server/ttse.c
+++ b/server/ttse.c
@@ -159,11 +159,6 @@ int ttse_send_error(ttse_error_e error, const char* msg)
 {
        int ret;
 
-       if (NULL == msg) {
-               SLOG(LOG_ERROR, tts_tag(), "[ERROR] Input parameter is null");
-               return TTSE_ERROR_INVALID_PARAMETER;
-       }
-
        ret = ttsd_send_error(error, msg);
 
        if (0 != ret) {