From 93ad5ecaa6291646cf565f473c7ba72daf210158 Mon Sep 17 00:00:00 2001 From: Suyeon Hwang Date: Wed, 27 Sep 2017 11:54:27 +0900 Subject: [PATCH] Remove null check from ttse_send_error Change-Id: Ie8ba9170a67c1776a635fcd7fe20721ea3105207 Signed-off-by: Suyeon Hwang --- server/ttsd_server.c | 2 +- server/ttse.c | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/server/ttsd_server.c b/server/ttsd_server.c index cdd6e9b..c00709c 100644 --- a/server/ttsd_server.c +++ b/server/ttsd_server.c @@ -178,7 +178,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 --- 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) { -- 2.7.4