From 20a83b89b25de582f56fc229c2164d4149404075 Mon Sep 17 00:00:00 2001 From: Wonnam Jang Date: Wed, 28 Jun 2017 15:15:29 +0900 Subject: [PATCH] Fix dlog format argument error Change-Id: I631761f4f8869bf4849e6f0bfd835f8bbdde4a23 Signed-off-by: Wonnam Jang --- client/tts_setting.c | 2 +- server/ttsd_config.c | 2 +- server/ttsd_data.cpp | 4 ++-- server/ttsd_server.c | 3 ++- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/client/tts_setting.c b/client/tts_setting.c index dee9257..c393b65 100644 --- a/client/tts_setting.c +++ b/client/tts_setting.c @@ -71,7 +71,7 @@ static int __setting_convert_config_error_code(tts_config_error_e code) void __setting_config_engine_changed_cb(const char* engine_id, const char* setting, const char* language, int voice_type, bool auto_voice, bool need_credential, void* user_data) { SLOG(LOG_DEBUG, TAG_TTSC, "Engine chagned : engine(%s) setting(%s) lang(%s) type(%d)", - engine_id, setting, language, language, voice_type); + engine_id, setting, language, voice_type); if (NULL != g_engine_changed_cb) g_engine_changed_cb(engine_id, g_engine_changed_user_data); diff --git a/server/ttsd_config.c b/server/ttsd_config.c index 363b8b7..7d0e1f6 100644 --- a/server/ttsd_config.c +++ b/server/ttsd_config.c @@ -46,7 +46,7 @@ void __ttsd_config_voice_changed_cb(const char* before_language, int before_type { /* Need to check voice is valid */ if (false == tts_config_check_default_voice_is_valid(language, type)) { - SLOG(LOG_ERROR, tts_tag(), "Lang(%s) type(%d) is NOT valid : %s", language, type); + SLOG(LOG_ERROR, tts_tag(), "Lang(%s) type(%d) is NOT valid", language, type); return; } diff --git a/server/ttsd_data.cpp b/server/ttsd_data.cpp index 3af4855..4d69c50 100644 --- a/server/ttsd_data.cpp +++ b/server/ttsd_data.cpp @@ -73,7 +73,7 @@ int __data_show_sound_list(int index) unsigned int i = 0; std::list::iterator iter; for (iter = g_app_list[index].m_wav_data.begin(); iter != g_app_list[index].m_wav_data.end(); ++iter) { - SLOG(LOG_DEBUG, tts_tag(), "[%dth][%p] data(%p) data size(%ld), uttid(%d), type(%d)", + SLOG(LOG_DEBUG, tts_tag(), "[%dth][%p] data(%p) data size(%d), uttid(%d), type(%d)", i, *iter, (*iter)->data, (*iter)->data_size, (*iter)->utt_id, (*iter)->audio_type); i++; } @@ -717,7 +717,7 @@ int ttsd_data_save_error_log(int uid, FILE* fp) i = 0; std::list::iterator iter; for (iter = g_app_list[index].m_wav_data.begin(); iter != g_app_list[index].m_wav_data.end(); ++iter) { - SLOG(LOG_DEBUG, tts_tag(), "[%dth][%p] data(%p) data size(%ld), uttid(%d), type(%d)", + SLOG(LOG_DEBUG, tts_tag(), "[%dth][%p] data(%p) data size(%d), uttid(%d), type(%d)", i, *iter, (*iter)->data, (*iter)->data_size, (*iter)->utt_id, (*iter)->audio_type); i++; } diff --git a/server/ttsd_server.c b/server/ttsd_server.c index c99f4a3..bb63410 100644 --- a/server/ttsd_server.c +++ b/server/ttsd_server.c @@ -941,7 +941,8 @@ int ttsd_server_pause(int uid, int* utt_id) return TTSD_ERROR_INVALID_STATE; } - SLOG(LOG_INFO, tts_tag(), "[Server] server pause, uid(%d), utt_id(%d)", uid, utt_id); + *utt_id = g_utt.uttid; + SLOG(LOG_INFO, tts_tag(), "[Server] server pause, uid(%d), g_uid(%d), utt_id(%d)", uid, g_utt.uid, *utt_id); int ret = 0; ret = ttsd_player_pause(uid); -- 2.7.4