Fix format string and variable name

By changing data type of uid, many mismatchess between data of format string and variable are
generated. And also, the name 'uid' is used too generally. I may cause misunderstand about
the purpose of the variable.

To solve this problem, this patch changes the format string to match the variables. And also,
this patch changes the name of variable to make name more clear.

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

diff --git a/common/vc_config_mgr.c b/common/vc_config_mgr.c
index cf3bbda9a4d415d44924ec3739cc99d9d54763ea..5436e4660cc2c466f89b529e68ea953b13b8111b 100644 (file)
--- a/common/vc_config_mgr.c
+++ b/common/vc_config_mgr.c
@@ -846,7 +846,7 @@ int vc_config_mgr_initialize(unsigned int uid)
                        get_uid = iter->data;
 
                        if (uid == *get_uid) {
-                               SLOG(LOG_WARN, vc_config_tag(), "[CONFIG] uid(%d) has already registered", uid);
+                               SLOG(LOG_WARN, vc_config_tag(), "[CONFIG] uid(%u) has already registered", uid);
                                pthread_mutex_unlock(&vc_config_mgr_mutex);
                                ecore_thread_main_loop_end();
                                SLOG(LOG_DEBUG, vc_config_tag(), "[WARNING] Leave critical section");
@@ -872,7 +872,7 @@ int vc_config_mgr_initialize(unsigned int uid)
                /* Add uid */
                g_config_client_list = g_slist_append(g_config_client_list, temp_client);
 
-               SLOG(LOG_WARN, vc_config_tag(), "[CONFIG] Add uid(%d) but config has already initialized", uid);
+               SLOG(LOG_WARN, vc_config_tag(), "[CONFIG] Add uid(%u) but config has already initialized", uid);
 
                __vc_config_mgr_print_client_info();
                pthread_mutex_unlock(&vc_config_mgr_mutex);
@@ -1031,7 +1031,7 @@ int vc_config_mgr_initialize(unsigned int uid)
        temp_client->lang_cb = NULL;
        temp_client->enabled_cb = NULL;
 
-       SLOG(LOG_DEBUG, vc_config_tag(), "uid(%d) temp_uid(%d)", uid, temp_client->uid);
+       SLOG(LOG_DEBUG, vc_config_tag(), "uid(%u) temp_uid(%u)", uid, temp_client->uid);
 
        /* Add uid */
        g_config_client_list = g_slist_append(g_config_client_list, temp_client);
@@ -1257,7 +1257,7 @@ int vc_config_mgr_unset_lang_cb(unsigned int uid)
 int vc_config_mgr_set_enabled_cb(unsigned int uid, vc_config_enabled_cb enabled_cb)
 {
        if (NULL == enabled_cb) {
-               SLOG(LOG_ERROR, vc_config_tag(), "[ERROR] enabled cb is NULL : uid(%d) ", uid);
+               SLOG(LOG_ERROR, vc_config_tag(), "[ERROR] enabled cb is NULL : uid(%u) ", uid);
                return VC_CONFIG_ERROR_INVALID_PARAMETER;
        }
 
@@ -2047,7 +2047,7 @@ int __vc_config_mgr_print_client_info()
        while (NULL != iter) {
                temp_client = iter->data;
 
-               SLOG(LOG_DEBUG, vc_config_tag(), "[%dth] uid(%d)", i, temp_client->uid);
+               SLOG(LOG_DEBUG, vc_config_tag(), "[%dth] uid(%u)", i, temp_client->uid);
 
                iter = g_slist_next(iter);
                i++;

diff --git a/common/vc_defs.h b/common/vc_defs.h
index 21c2e58563f3a30adaeeccdbbd4f14b4617f110e..2578ba37d012b27a2876a96f0bc450d940e2f06d 100644 (file)
--- a/common/vc_defs.h
+++ b/common/vc_defs.h
@@ -232,6 +232,7 @@ extern "C" {
 #define VC_RETRY_COUNT                 5
 #define VC_RUNTIME_INFO_NO_FOREGROUND  -1
 #define VC_CONNECTION_RETRY_COUNT      10
+#define VC_INVALID_TTS_UID     0
 
 #define VC_FEATURE_PATH                        "tizen.org/feature/speech.control"
 #define VC_MGR_FEATURE_PATH            "tizen.org/feature/speech.control_manager"

diff --git a/engine-parser/src/vc-engine-parser.c b/engine-parser/src/vc-engine-parser.c
index 66633751834f0d7a2960e2de9e4b19f842b5f6de..44d0f8e2be9a7ec900dc01707732a8a64482041a 100644 (file)
--- a/engine-parser/src/vc-engine-parser.c
+++ b/engine-parser/src/vc-engine-parser.c
@@ -118,7 +118,7 @@ static int __save_engine_info_xml(const char *pkgid, gchar *ut, uid_t uid, gid_t
        uid_t globalapp_uid = tzplatform_getuid(TZ_SYS_GLOBALAPP_USER);
        uid_t tmp_uid = 0;
        gid_t tmp_gid = 0;
-       LOGD("uid(%d)", uid);
+       LOGD("uid(%u)", uid);
 
        if (globalapp_uid == uid) {
                /* Global app */
@@ -281,7 +281,7 @@ static int __remove_engine_info_xml(const char *pkgid, gchar *ut, uid_t uid)
 
        uid_t globalapp_uid = tzplatform_getuid(TZ_SYS_GLOBALAPP_USER);
 
-       LOGD("uid(%d)", uid);
+       LOGD("uid(%u)", uid);
 
        if (globalapp_uid == uid) {
                /* Global app */
@@ -404,7 +404,7 @@ EXPORT_API
 int PKGMGR_MDPARSER_PLUGIN_INSTALL(const char *pkgid, const char *appid, GList *list)
 {
        LOGD("METADATA INSTALL");
-       LOGD("pkgid(%s) appid(%s) list(%d)", pkgid, appid, g_list_length(list));
+       LOGD("pkgid(%s) appid(%s) list(%u)", pkgid, appid, g_list_length(list));
 
        int ret = -1;
        ret = pkgmgr_installer_info_get_target_uid(&g_uid);
@@ -412,8 +412,8 @@ int PKGMGR_MDPARSER_PLUGIN_INSTALL(const char *pkgid, const char *appid, GList *
                LOGE("[ERROR] Fail to get target uid");
                return 0;
        } else {
-               LOGD("uid(%d)", g_uid);
-               printf("[Parser Debug][DEBUG] uid(%d)", g_uid);
+               LOGD("uid(%u)", g_uid);
+               printf("[Parser Debug][DEBUG] uid(%u)", g_uid);
        }
 
        uid_t globalapp_uid = tzplatform_getuid(TZ_SYS_GLOBALAPP_USER);
@@ -545,7 +545,7 @@ int PKGMGR_MDPARSER_PLUGIN_INSTALL(const char *pkgid, const char *appid, GList *
 
                        LOGD("[DEBUG] user info");
                        if (NULL != home_dir) {
-                               LOGD("[DEBUG] uid(%d), gid(%d), user_type(%s), home_dir(%s)", uid, gid, user_type, home_dir);
+                               LOGD("[DEBUG] uid(%u), gid(%u), user_type(%s), home_dir(%s)", uid, gid, user_type, home_dir);
 
                                FREE(g_dir_config_base)
                                FREE(g_dir_home)
@@ -672,7 +672,7 @@ EXPORT_API
 int PKGMGR_MDPARSER_PLUGIN_UNINSTALL(const char *pkgid, const char *appid, GList *list)
 {
        LOGD("METADATA UNINSTALL");
-       LOGD("pkgid(%s) appid(%s) list(%d)", pkgid, appid, g_list_length(list));
+       LOGD("pkgid(%s) appid(%s) list(%u)", pkgid, appid, g_list_length(list));
 
        int ret = -1;
        ret = pkgmgr_installer_info_get_target_uid(&g_uid);
@@ -680,8 +680,8 @@ int PKGMGR_MDPARSER_PLUGIN_UNINSTALL(const char *pkgid, const char *appid, GList
                LOGE("[ERROR] Fail to get target uid");
                return 0;
        } else {
-               LOGD("uid(%d)", g_uid);
-               printf("[Parser Debug][DEBUG] uid(%d)", g_uid);
+               LOGD("uid(%u)", g_uid);
+               printf("[Parser Debug][DEBUG] uid(%u)", g_uid);
        }
 
        uid_t globalapp_uid = tzplatform_getuid(TZ_SYS_GLOBALAPP_USER);
@@ -870,7 +870,7 @@ EXPORT_API
 int PKGMGR_MDPARSER_PLUGIN_UPGRADE(const char *pkgid, const char *appid, GList *list)
 {
        LOGD("METADATA UPGRADE");
-       LOGD("pkgid(%s) appid(%s) list(%d)", pkgid, appid, g_list_length(list));
+       LOGD("pkgid(%s) appid(%s) list(%u)", pkgid, appid, g_list_length(list));
 
        PKGMGR_MDPARSER_PLUGIN_UNINSTALL(pkgid, appid, list);
        PKGMGR_MDPARSER_PLUGIN_INSTALL(pkgid, appid, list);

diff --git a/server/vcd_server.c b/server/vcd_server.c
index 853597cd025a7347c517ef00043085ba183bda96..aa2a3471fc7e9f80c8e6745394e5e70568c6eda8 100644 (file)
--- a/server/vcd_server.c
+++ b/server/vcd_server.c
@@ -45,7 +45,7 @@ static Ecore_Timer *g_check_widget_client_timer = NULL;
 static Ecore_Timer *g_check_client_timer = NULL;
 
 static Ecore_Thread* g_tts_thread = NULL;
-static unsigned int g_current_uid = 0;
+static unsigned int g_current_tts_uid = VC_INVALID_TTS_UID;
 static int g_current_utt_id = -1;
 
 /**
@@ -1132,12 +1132,12 @@ int vcd_send_error(vce_error_e error, const char* msg, void *user_data)
 /* for TTS feedback */
 int vcd_send_feedback_audio_format(int rate, vce_audio_channel_e channel, vce_audio_type_e audio_type)
 {
-       SLOG(LOG_INFO, TAG_VCD, "[Server DEBUG] Engine - Send TTS feedback audio format, g_current_uid(%d)", g_current_uid);
+       SLOG(LOG_INFO, TAG_VCD, "[Server DEBUG] Engine - Send TTS feedback audio format, g_current_tts_uid(%u)", g_current_tts_uid);
 
        /* send TTS feedback audio format to VC manager */
        int ret = VCD_ERROR_NONE;
-       int pid = g_current_uid / 1000;
-       if (0 == g_current_uid || vcd_client_manager_get_pid() == pid) {
+       int pid = g_current_tts_uid / 1000;
+       if (VC_INVALID_TTS_UID == g_current_tts_uid || vcd_client_manager_get_pid() == pid) {
                ret = vcdc_send_feedback_audio_format_to_manager(vcd_client_manager_get_pid(), rate, channel, audio_type);
                if (VCD_ERROR_NONE != ret) {
                        SLOG(LOG_ERROR, TAG_VCD, "[Server ERROR] Fail to send TTS feedback audio format to VC manager");
@@ -1151,17 +1151,17 @@ int vcd_send_feedback_audio_format(int rate, vce_audio_channel_e channel, vce_au
 
 int vcd_send_feedback_streaming(vce_feedback_event_e event, char* buffer, int len)
 {
-       if (0 == g_current_uid && VCE_FEEDBACK_EVENT_START == event) {
+       if (VC_INVALID_TTS_UID == g_current_tts_uid && VCE_FEEDBACK_EVENT_START == event) {
                g_current_utt_id = (g_current_utt_id + 1) % 1000;
-               g_current_uid = vcd_client_manager_get_pid() * 1000 + g_current_utt_id;
+               g_current_tts_uid = vcd_client_manager_get_pid() * 1000 + g_current_utt_id;
                SLOG(LOG_INFO, TAG_VCD, "[Server info] set current uid and utt_id as manager pid(%d)", vcd_client_manager_get_pid());
        }
 
        int ret = VCD_ERROR_NONE;
-       int pid = g_current_uid / 1000;
-       int utt_id = g_current_uid % 1000;
+       int pid = g_current_tts_uid / 1000;
+       int utt_id = g_current_tts_uid % 1000;
 
-       SLOG(LOG_INFO, TAG_VCD, "[Server DEBUG] Engine - Send TTS feedback streaming event(%d), uid(%d), is_mgr_client(%d)", event, g_current_uid, (pid == vcd_client_manager_get_pid() ? true : false));
+       SLOG(LOG_INFO, TAG_VCD, "[Server DEBUG] Engine - Send TTS feedback streaming event(%d), uid(%u), is_mgr_client(%d)", event, g_current_tts_uid, (pid == vcd_client_manager_get_pid() ? true : false));
 
        if (pid == vcd_client_manager_get_pid()) {
                /* send TTS feedback streaming to manager client */
@@ -1179,7 +1179,7 @@ int vcd_send_feedback_streaming(vce_feedback_event_e event, char* buffer, int le
 
        if (VCE_FEEDBACK_EVENT_FINISH == event) {
                /* reset current uid */
-               g_current_uid = 0;
+               g_current_tts_uid = VC_INVALID_TTS_UID;
 
                /* Set service state to ready if state is synthesizing */
                vcd_state_e state = vcd_config_get_service_state();
@@ -1348,7 +1348,7 @@ int vcd_initialize(vce_request_callback_s *callback)
                SLOG(LOG_WARN, TAG_VCD, "[Server Warning] Fail to create timer of client check");
        }
 
-       g_current_uid = 0;
+       g_current_tts_uid = VC_INVALID_TTS_UID;
        g_current_utt_id = -1;
 
        SLOG(LOG_ERROR, TAG_VCD, "[Server SUCCESS] initialize");
@@ -2648,19 +2648,18 @@ static void __start_tts_request_thread(void* data, Ecore_Thread* thread)
                vcd_config_set_service_state(VCD_STATE_SYNTHESIZING);
 
                /* Set current uid */
-               g_current_uid = tts_text_data->uid;
+               g_current_tts_uid = tts_text_data->uid;
 
                /* Request tts to engine */
                ret = vcd_engine_request_tts(tts_text_data->pid, tts_text_data->utt_id, tts_text_data->text, tts_text_data->language);
                if (0 != ret) {
                        SLOG(LOG_ERROR, TAG_VCD, "[Server ERROR] Fail to request tts : %d", ret);
                } else {
-                       SLOG(LOG_INFO, TAG_VCD, "[Server SUCCESS] request tts, uid(%d) pid(%d), text(%s), language(%s), utt_id(%d)",
+                       SLOG(LOG_INFO, TAG_VCD, "[Server SUCCESS] request tts, uid(%u) pid(%d), text(%s), language(%s), utt_id(%d)",
                                tts_text_data->uid, tts_text_data->pid, tts_text_data->text, tts_text_data->language, tts_text_data->utt_id);
                }
                /* clear tts text data after use */
                vcd_data_clear_tts_text_data(&tts_text_data);
-
        }
 }
 
@@ -2684,16 +2683,16 @@ int vcd_server_request_tts(int pid, const char* text, const char* language, int
                return VCD_ERROR_INVALID_STATE;
        }
 
-       unsigned int uid = 0;
+       unsigned int tts_uid = VC_INVALID_TTS_UID;
        g_current_utt_id = (g_current_utt_id + 1) % 1000;
        *utt_id = g_current_utt_id;
        if (0 == to_vcm) {
-               uid = pid * 1000 + g_current_utt_id;
+               tts_uid = pid * 1000 + g_current_utt_id;
        } else {
-               uid = vcd_client_manager_get_pid() * 1000 + g_current_utt_id;
+               tts_uid = vcd_client_manager_get_pid() * 1000 + g_current_utt_id;
        }
        SLOG(LOG_INFO, TAG_VCD, "[Server INFO] pid(%d), text(%s), language(%s), to_vcm(%d), ", pid, text, language, to_vcm);
-       SLOG(LOG_INFO, TAG_VCD, "[Server INFO] current_uid(%d), current_utt_id(%d)", uid, g_current_utt_id);
+       SLOG(LOG_INFO, TAG_VCD, "[Server INFO] current_uid(%u), current_utt_id(%d)", tts_uid, g_current_utt_id);
 
        vc_tts_text_data_s* tts_text_data;
        tts_text_data = (vc_tts_text_data_s*)calloc(1, sizeof(vc_tts_text_data_s));
@@ -2701,13 +2700,13 @@ int vcd_server_request_tts(int pid, const char* text, const char* language, int
                SLOG(LOG_ERROR, TAG_VCD, "[Server ERROR] Fail to callocate memory ");
                return VCD_ERROR_OUT_OF_MEMORY;
        }
-       tts_text_data->uid = uid;
+       tts_text_data->uid = tts_uid;
        tts_text_data->pid = pid;
        tts_text_data->utt_id = g_current_utt_id;
        tts_text_data->text = strdup(text);
        tts_text_data->language = strdup(language);
 
-       int ret = vcd_data_add_tts_text_data(tts_text_data->uid, tts_text_data);
+       int ret = vcd_data_add_tts_text_data(tts_text_data);
        if (0 != ret) {
                SLOG(LOG_ERROR, TAG_VCD, "[Server ERROR] Fail to add tts text data : %d", ret);
        }
@@ -2737,8 +2736,8 @@ int vcd_server_cancel_tts(int pid, int utt_id)
 
        vc_tts_text_data_s* tts_text_data = NULL;
 
-       unsigned int uid = pid * 1000 + utt_id;
-       int ret = vcd_data_get_tts_text_data(uid, &tts_text_data);
+       unsigned int tts_uid = pid * 1000 + utt_id;
+       int ret = vcd_data_get_tts_text_data(tts_uid, &tts_text_data);
        if (0 != ret) {
                SLOG(LOG_WARN, TAG_VCD, "[Server WARN] No data in vcd tts text queue");
        } else {

diff --git a/server/vcd_server_data.cpp b/server/vcd_server_data.cpp
index 9cf6da550bc7693c62af7a25bcf10e6c30184ade..7a238aa1ac8db5c033d5f1b8485ab0525c068724 100644 (file)
--- a/server/vcd_server_data.cpp
+++ b/server/vcd_server_data.cpp
@@ -40,7 +40,7 @@ static int __data_show_text_list(void)
        if (!g_tts_text_data.empty()) {
                std::list<vc_tts_text_data_s*>::iterator iter;
                for (iter = g_tts_text_data.begin(); (NULL != *iter && iter != g_tts_text_data.end()); ++iter) {
-                       SLOG(LOG_DEBUG, TAG_VCD, "[%p] uid(%d), pid(%d), utt_id(%d), text(%s), language(%s)",
+                       SLOG(LOG_DEBUG, TAG_VCD, "[%p] uid(%u), pid(%d), utt_id(%d), text(%s), language(%s)",
                                *iter, (*iter)->uid, (*iter)->pid, (*iter)->utt_id, (*iter)->text, (*iter)->language);
                }
        } else {
@@ -51,7 +51,7 @@ static int __data_show_text_list(void)
        return VCD_ERROR_NONE;
 }
 
-int vcd_data_add_tts_text_data(unsigned int uid, vc_tts_text_data_s* data)
+int vcd_data_add_tts_text_data(vc_tts_text_data_s* data)
 {
        if (NULL == data) {
                SLOG(LOG_ERROR, TAG_VCD, "[DATA ERROR] feedback data is NULL");
@@ -71,7 +71,7 @@ int vcd_data_add_tts_text_data(unsigned int uid, vc_tts_text_data_s* data)
 
                return VCD_ERROR_OUT_OF_MEMORY;
        }
-       SLOG(LOG_ERROR, TAG_VCD, "[DATA][%p] uid(%d), pid(%d), utt_id(%d), text(%s), language(%s)",
+       SLOG(LOG_ERROR, TAG_VCD, "[DATA][%p] uid(%u), pid(%d), utt_id(%d), text(%s), language(%s)",
                *iter, (*iter)->uid, (*iter)->pid, (*iter)->utt_id, (*iter)->text, (*iter)->language);
 
 #ifdef DATA_DEBUG
@@ -88,7 +88,7 @@ int vcd_data_clear_tts_text_data(vc_tts_text_data_s** tts_text_data)
 
        if (!g_tts_text_data.empty()) {
                if (NULL != *tts_text_data) {
-                       SLOG(LOG_DEBUG, TAG_VCD, "[DEBUG] uid(%d), pid(%d), utt_id(%d), text(%s), language(%s)",
+                       SLOG(LOG_DEBUG, TAG_VCD, "[DEBUG] uid(%u), pid(%d), utt_id(%d), text(%s), language(%s)",
                                (*tts_text_data)->uid, (*tts_text_data)->pid, (*tts_text_data)->utt_id, (*tts_text_data)->text, (*tts_text_data)->language);
 
                        if (NULL != (*tts_text_data)->text) {
@@ -110,9 +110,9 @@ int vcd_data_clear_tts_text_data(vc_tts_text_data_s** tts_text_data)
        return VCD_ERROR_NONE;
 }
 
-int vcd_data_get_tts_text_data(unsigned int uid, vc_tts_text_data_s** data)
+int vcd_data_get_tts_text_data(unsigned int tts_uid, vc_tts_text_data_s** data)
 {
-       SLOG(LOG_INFO, TAG_VCD, "[DATA] Get tts text data : uid(%d)", uid);
+       SLOG(LOG_INFO, TAG_VCD, "[DATA] Get tts text data : uid(%u)", tts_uid);
 
        /* mutex is locked */
        pthread_mutex_lock(&g_tts_text_data_mutex);
@@ -127,7 +127,7 @@ int vcd_data_get_tts_text_data(unsigned int uid, vc_tts_text_data_s** data)
        std::list<vc_tts_text_data_s *>::iterator iter;
        iter = g_tts_text_data.begin();
        while (iter != g_tts_text_data.end()) {
-               if (uid == (*iter)->uid) {
+               if (tts_uid == (*iter)->uid) {
                        *data = *iter;
                        iter = g_tts_text_data.erase(iter);
                } else {

diff --git a/server/vcd_server_data.h b/server/vcd_server_data.h
index 86e4ece0df78c9b2c790782fa206eb85b4bcbe24..a53e3ca3bc4e2f696be3e0547cefc05ac693a02f 100644 (file)
--- a/server/vcd_server_data.h
+++ b/server/vcd_server_data.h
@@ -38,11 +38,11 @@ typedef struct {
 } vc_tts_text_data_s;
 
 
-int vcd_data_add_tts_text_data(unsigned int uid, vc_tts_text_data_s* data);
+int vcd_data_add_tts_text_data(vc_tts_text_data_s* data);
 
 int vcd_data_clear_tts_text_data(vc_tts_text_data_s** tts_text_data);
 
-int vcd_data_get_tts_text_data(unsigned int uid, vc_tts_text_data_s** data);
+int vcd_data_get_tts_text_data(unsigned int tts_uid, vc_tts_text_data_s** data);
 
 int vcd_data_get_first_tts_text_data(vc_tts_text_data_s** data);