Fix dlog format errors

Change-Id: If1b8c7a8b16cb6ca27f25f9bcfb7741def7ff85a
Signed-off-by: Kiseok Chang <kiso.chang@samsung.com>

diff --git a/setting-appmgr/src/setting-appmgr-pkginfo.c b/setting-appmgr/src/setting-appmgr-pkginfo.c
index bf947cb9bde5e3ea08315c32f961a21ead0df96e..e2fe2d3817c6a0d8f256ba3316f728035bffc0a2 100755 (executable)
--- a/setting-appmgr/src/setting-appmgr-pkginfo.c
+++ b/setting-appmgr/src/setting-appmgr-pkginfo.c
@@ -855,7 +855,7 @@ static int _get_privilege_detail_cb(const char *privilege, void *user_data)
        ret = privilege_info_get_description("3.0", privilege,
                                                &privilege_data->explanation);
        if (PRVINFO_ERROR_NONE != ret) {
-               SETTING_TRACE_ERROR("privilege_info_get_description() Fail(%d)",
+               SETTING_TRACE_ERROR("privilege_info_get_description() Fail(%s)",
                                get_error_message(ret));
                free(privilege_data->name);
                free(privilege_data);

diff --git a/setting-common/src/setting-common-data-slp-setting.c b/setting-common/src/setting-common-data-slp-setting.c
index 34625bcb711c4617c0713e0a8135b28b3187f152..00f0ecef0f98f719b93192f28d5ed2cf6485a9e8 100755 (executable)
--- a/setting-common/src/setting-common-data-slp-setting.c
+++ b/setting-common/src/setting-common-data-slp-setting.c
@@ -130,15 +130,15 @@ void import_default(VconfNode *node, void *data)
        switch (node->type) {
        case eBOOL:
                SETTING_TRACE("IMPORTING key : %s : %d : %d", node->vconf_key,
-                               node->type, node->value);
+                               (int)node->type, node->value.b);
                break;
        case eINT:
                SETTING_TRACE("IMPORTING key : %s : %d : %d", node->vconf_key,
-                               node->type, node->value);
+                               (int)node->type, node->value.i);
                break;
        case eSTRING:
                SETTING_TRACE("IMPORTING key : %s : %d : %s", node->vconf_key,
-                               node->type, node->value);
+                               (int)node->type, node->value.c);
                break;
        }
 }
@@ -929,7 +929,7 @@ int setting_set_bool_slp_key(setting_bool_slp_list key, int value, int *err)
 
        SETTING_TRACE(
                        "setting_set_bool ::: KEY:%d VCONF_KEY=%s TYPE=%d " "VALUE=%d ",
-                       result.key, result.vconf_key, result.type,
+                       result.key, result.vconf_key, (int)result.type,
                        result.value.b);
        return ret;
 }
@@ -972,7 +972,7 @@ int setting_set_int_slp_key(setting_int_slp_list key, int value, int *err)
        *err = ret;
        SETTING_TRACE_DEBUG(
                        "setting_set_int ::: KEY:%d VCONF_KEY=%s TYPE=%d " "VALUE=%d ",
-                       result.key, result.vconf_key, result.type,
+                       result.key, result.vconf_key, (int)result.type,
                        result.value.i);
        return ret;
 }
@@ -1016,8 +1016,8 @@ int setting_set_string_slp_key(setting_str_slp_list key, char *value, int *err)
        g_stable[key].value.c = "";
 
        SETTING_TRACE(
-                       "setting_set_str ::: KEY:%d VCONF_KEY=%s TYPE=%d " "VALUE=%d ",
-                       result.key, result.vconf_key, result.type,
+                       "setting_set_str ::: KEY:%d VCONF_KEY=%s TYPE=%d " "VALUE=%s ",
+                       result.key, result.vconf_key, (int)result.type,
                        result.value.c);
        *err = ret;
        return ret;

diff --git a/setting-common/src/setting-common-draw-popup.c b/setting-common/src/setting-common-draw-popup.c
old mode 100644 (file)
new mode 100755 (executable)
index 3400ada..6200d85
--- a/setting-common/src/setting-common-draw-popup.c
+++ b/setting-common/src/setting-common-draw-popup.c
@@ -336,11 +336,11 @@ Evas_Object *setting_create_popup2(void *data, Evas_Object *parent, char *title,
 
        ADD_POPUP_BTN(btn_num, popup, response_cb, data);
 
-       SETTING_TRACE("title...:%s", evas_object_data_get(popup, "title"));
-       SETTING_TRACE("text...:%s", evas_object_data_get(popup, "text"));
-       SETTING_TRACE("button1...:%s", evas_object_data_get(popup, "button1"));
-       SETTING_TRACE("button2...:%s", evas_object_data_get(popup, "button2"));
-       SETTING_TRACE("button3...:%s", evas_object_data_get(popup, "button3"));
+       SETTING_TRACE("title...:%s", (char *)evas_object_data_get(popup, "title"));
+       SETTING_TRACE("text...:%s", (char *)evas_object_data_get(popup, "text"));
+       SETTING_TRACE("button1...:%s", (char *)evas_object_data_get(popup, "button1"));
+       SETTING_TRACE("button2...:%s", (char *)evas_object_data_get(popup, "button2"));
+       SETTING_TRACE("button3...:%s", (char *)evas_object_data_get(popup, "button3"));
 
        evas_object_show(popup);
        SETTING_TRACE_END;
@@ -394,11 +394,11 @@ Evas_Object *setting_create_popup(void *data, Evas_Object *parent,
 
        ADD_POPUP_BTN(btn_num, popup, response_cb, data);
 
-       SETTING_TRACE("title...:%s", evas_object_data_get(popup, "title"));
-       SETTING_TRACE("text...:%s", evas_object_data_get(popup, "text"));
-       SETTING_TRACE("button1...:%s", evas_object_data_get(popup, "button1"));
-       SETTING_TRACE("button2...:%s", evas_object_data_get(popup, "button2"));
-       SETTING_TRACE("button3...:%s", evas_object_data_get(popup, "button3"));
+       SETTING_TRACE("title...:%s", (char *)evas_object_data_get(popup, "title"));
+       SETTING_TRACE("text...:%s", (char *)evas_object_data_get(popup, "text"));
+       SETTING_TRACE("button1...:%s", (char *)evas_object_data_get(popup, "button1"));
+       SETTING_TRACE("button2...:%s", (char *)evas_object_data_get(popup, "button2"));
+       SETTING_TRACE("button3...:%s", (char *)evas_object_data_get(popup, "button3"));
 
        evas_object_show(popup);
        SETTING_TRACE_END;
@@ -472,11 +472,11 @@ Evas_Object *setting_create_popup_with_progressbar(void *data,
 
        ADD_POPUP_BTN(btn_num, popup, response_cb, data);
 
-       SETTING_TRACE("title...:%s", evas_object_data_get(popup, "title"));
-       SETTING_TRACE("text...:%s", evas_object_data_get(popup, "text"));
-       SETTING_TRACE("button1...:%s", evas_object_data_get(popup, "button1"));
-       SETTING_TRACE("button2...:%s", evas_object_data_get(popup, "button2"));
-       SETTING_TRACE("button3...:%s", evas_object_data_get(popup, "button3"));
+       SETTING_TRACE("title...:%s", (char *)evas_object_data_get(popup, "title"));
+       SETTING_TRACE("text...:%s", (char *)evas_object_data_get(popup, "text"));
+       SETTING_TRACE("button1...:%s", (char *)evas_object_data_get(popup, "button1"));
+       SETTING_TRACE("button2...:%s", (char *)evas_object_data_get(popup, "button2"));
+       SETTING_TRACE("button3...:%s", (char *)evas_object_data_get(popup, "button3"));
 
        evas_object_show(popup);
 

diff --git a/setting-display/src/setting-display-brightness.c b/setting-display/src/setting-display-brightness.c
index 86547d700d2c966e95a0f3c740e4da5983569eba..ad32260765caed681abb2b41a69dc7e4088cbbec 100755 (executable)
--- a/setting-display/src/setting-display-brightness.c
+++ b/setting-display/src/setting-display-brightness.c
@@ -383,10 +383,10 @@ static void _brightness_slider_mouse_up_cb(void *data, Evas *e,
        Setting_GenGroupItem_Data *list_item =
                        (Setting_GenGroupItem_Data *) data;
 
-       setting_retm_if(data == NULL, , "Data parameter is NULL");
+       setting_retm_if(data == NULL, "Data parameter is NULL");
 
        ad = list_item->userdata;
-       setting_retm_if(ad == NULL, , "ad parameter is NULL");
+       setting_retm_if(ad == NULL, "ad parameter is NULL");
 
        _brightness_overheat_check(ad);
 }
@@ -693,7 +693,6 @@ void construct_brightness(void *data, Evas_Object *genlist)
        }
 
        left_icon = setting_brightness_get_slider_icon(value);
-       SETTING_TRACE("###> left_icon: [%d]", left_icon);
        /* [UI] Slider control for Bightness */
        ad->data_br_sli = setting_create_Gendial_field_def(
                        genlist,

diff --git a/setting-font/src/setting-font-main.c b/setting-font/src/setting-font-main.c
index e856367bcc7b086b3deee31ef868f74b9b5f7081..41b73889b20afe4f6c7007dea269f8379d233279 100755 (executable)
--- a/setting-font/src/setting-font-main.c
+++ b/setting-font/src/setting-font-main.c
@@ -872,7 +872,6 @@ static int setting_font_main_create(void *cb)
 
        setting_create_Gendial_itc(SETTING_GENLIST_LEFT_ICON_CONTENT_ICON_STYLE,
                        &(ad->itc_bg_1icon));
-       SETTING_TRACE("ad->itc_bg_1icon: %s ", ad->itc_bg_1icon);
        ad->itc_bg_1icon.func.content_get = _font_size_slider_get;
 
        setting_create_Gendial_itc(SETTING_GENLIST_MULTILINE_STYLE,

diff --git a/setting-language-and-input/src/setting-language-and-input.c b/setting-language-and-input/src/setting-language-and-input.c
old mode 100644 (file)
new mode 100755 (executable)
index 64973b3..940c25b
--- a/setting-language-and-input/src/setting-language-and-input.c
+++ b/setting-language-and-input/src/setting-language-and-input.c
@@ -111,7 +111,7 @@ static bool on_app_create(void *priv)
                SETTING_TRACE("fail to get vconf");
        } else if (value == VCONFKEY_TELEPHONY_SIM_INSERTED) {
                ad->handle = tel_init(NULL);
-               SETTING_TRACE("ad->handle: %d", ad->handle);
+               SETTING_TRACE("ad->handle: %p", ad->handle);
                memset(&(ad->imsi), 0, sizeof(TelSimImsiInfo_t));
                if (ad->handle
                                && TAPI_API_SUCCESS == tel_get_sim_imsi(

diff --git a/setting-profile/src/setting-profile-common.c b/setting-profile/src/setting-profile-common.c
index a1fc68a0406790f02d895d3de4e5d275be11224b..2ac758caba06d3f9476c907b4e113567f3ebf90c 100755 (executable)
--- a/setting-profile/src/setting-profile-common.c
+++ b/setting-profile/src/setting-profile-common.c
@@ -361,7 +361,7 @@ bool setting_sound_play_sound(
                return false;
        }
        ad->mp_prepare_async = ad->mp_player;
-       SETTING_TRACE("waiting..player (%x)", ad->mp_prepare_async);
+       SETTING_TRACE("waiting..player (%p)", ad->mp_prepare_async);
 #else
        err = player_prepare(ad->mp_player);
        if (err != PLAYER_ERROR_NONE) {
@@ -1277,7 +1277,7 @@ static Eina_Bool __play_timer_cb(void *data)
        retv_if(!data, EINA_FALSE);
        SettingSoundData *ad = (SettingSoundData *)data;
 
-       SETTING_TRACE("player (%x)", ad->mp_prepare_async);
+       SETTING_TRACE("player (%p)", ad->mp_prepare_async);
        err = player_get_state(ad->mp_player, &state);
        SETTING_TRACE("state:%d", state);
 

diff --git a/setting-profile/src/setting-profile-sound-main.c b/setting-profile/src/setting-profile-sound-main.c
index a35078e50795df35d3362862771a87dedd66cb1e..9bf220e4da51d8760485317629901e1234eb13c0 100755 (executable)
--- a/setting-profile/src/setting-profile-sound-main.c
+++ b/setting-profile/src/setting-profile-sound-main.c
@@ -786,7 +786,7 @@ static void _get_lite_main_list(void *data)
        /* 3. Notification alert */
        if (0 != safeStrCmp(ad->viewtype, VOLUME_APP_NAME)) {
                pa_ringtone = vconf_get_str(VCONFKEY_SETAPPL_NOTI_MSG_RINGTONE_PATH_STR);
-               SETTING_TRACE_WARNING("<MS> NOTI VCONF: %s", __FILE__, __LINE__, pa_ringtone);
+               SETTING_TRACE_WARNING("<MS> NOTI VCONF: %s", pa_ringtone);
 
 
                if (!pa_ringtone || strlen(pa_ringtone) == 0) {

diff --git a/setting-ringtone/src/setting-ringtone-util.c b/setting-ringtone/src/setting-ringtone-util.c
index 42851bb9f8ab73d65a3d3b46972a38cdd844b467..8bed1d1e39c769f0e0efb604e65398a9a3d9fc4a 100755 (executable)
--- a/setting-ringtone/src/setting-ringtone-util.c
+++ b/setting-ringtone/src/setting-ringtone-util.c
@@ -115,7 +115,7 @@ static inline bool _aquire_focus(SettingRingtoneData *ringtone_data)
 
        err = sound_manager_get_focus_state(ringtone_data->ringtone_sound_stream_info, &state_for_playback, NULL);
        if (err != SOUND_MANAGER_ERROR_NONE) {
-               SETTING_TRACE_ERROR("[%s:%d] sound_manager_get_focus_state() error: %s", get_error_message(err));
+               SETTING_TRACE_ERROR("sound_manager_get_focus_state() error: %s", get_error_message(err));
                return false;
        }
 
@@ -138,7 +138,7 @@ static inline bool _release_focus(SettingRingtoneData *ringtone_data)
 
        err = sound_manager_get_focus_state(ringtone_data->ringtone_sound_stream_info, &state_for_playback, NULL);
        if (err != SOUND_MANAGER_ERROR_NONE) {
-               SETTING_TRACE_ERROR("[%s:%d] sound_manager_get_focus_state() error: %s", get_error_message(err));
+               SETTING_TRACE_ERROR("sound_manager_get_focus_state() error: %s", get_error_message(err));
                return false;
        }
 
@@ -147,7 +147,7 @@ static inline bool _release_focus(SettingRingtoneData *ringtone_data)
 
        err = sound_manager_release_focus(ringtone_data->ringtone_sound_stream_info, SOUND_STREAM_FOCUS_FOR_PLAYBACK, SOUND_BEHAVIOR_NONE, NULL);
        if (err != SOUND_MANAGER_ERROR_NONE) {
-               SETTING_TRACE_ERROR("[%s:%d] sound_manager_release_focus() error: %s", get_error_message(err));
+               SETTING_TRACE_ERROR("sound_manager_release_focus() error: %s", get_error_message(err));
                return false;
        }
        return true;

diff --git a/setting-ringtone/src/setting-ringtone.c b/setting-ringtone/src/setting-ringtone.c
old mode 100644 (file)
new mode 100755 (executable)
index ac0b9e4..c0c690c
--- a/setting-ringtone/src/setting-ringtone.c
+++ b/setting-ringtone/src/setting-ringtone.c
@@ -176,7 +176,7 @@ static bool _setting_ringtone_app_create(void *priv)
        err = player_set_sound_stream_info(ringtone_data->media_player,
                                                                                ringtone_data->ringtone_sound_stream_info);
        if (PLAYER_ERROR_NONE != err) {
-               SETTING_TRACE_ERROR("error to set sound_type[%S]", get_error_message(err));;
+               SETTING_TRACE_ERROR("error to set sound_type[%s]", get_error_message(err));;
                return false;
        }
 

diff --git a/setting-storage/src/setting-storage-main.c b/setting-storage/src/setting-storage-main.c
index dbb6c7d470c8483fff96aeb4ef12bbd9db503c88..695336cf499ceeda79704089cab61baa0f11132f 100755 (executable)
--- a/setting-storage/src/setting-storage-main.c
+++ b/setting-storage/src/setting-storage-main.c
@@ -143,7 +143,7 @@ static inline void _update_storage_graph(SettingStorage *ad,
        edje_object_message_send(elm_layout_edje_get(target),
                        EDJE_MESSAGE_FLOAT_SET,
                        SET_STORAGE_GRAPH_MSG_ID, msg);
-       SETTING_TRACE_DEBUG("Sizes message sent: %f %f %f %f %f %f %f",
+       SETTING_TRACE_DEBUG("Sizes message sent: %f %f %f %f %f %f %f %f",
                        msg->val[0], msg->val[1], msg->val[2], msg->val[3],
                        msg->val[4], msg->val[5], msg->val[6], msg->val[7]);
        edje_object_message_signal_process(elm_layout_edje_get(target));

diff --git a/setting-storage/src/setting-storage-utils.c b/setting-storage/src/setting-storage-utils.c
index 9aa4e1fab17866d67added7c26b619cd7e0f0303..017d600057c8ff9f76ce02ca891fcb41fbcad2bd 100755 (executable)
--- a/setting-storage/src/setting-storage-utils.c
+++ b/setting-storage/src/setting-storage-utils.c
@@ -50,7 +50,7 @@ void storage_get_internal_storage_status(double *total, double *avail)
 
        ret = storage_get_internal_memory_size(&s);
        if (0 == ret) {
-               SETTING_TRACE("Total = %lu, Available = %lu",
+               SETTING_TRACE("Total = %llu, Available = %llu",
                                (s.f_frsize * s.f_blocks),
                                (s.f_bsize * s.f_bavail));
                tmp_total = (double)s.f_frsize * s.f_blocks;
@@ -78,15 +78,14 @@ void storage_get_external_storage_status(const char *path, double *total,
        ret_if(NULL == avail);
 
        if (!storage_get_external_memory_size(&s)) {
-               SETTING_TRACE("f_frsize = %ld f_blocks = %ld f_bsize = %ld "
-                               "f_bavail = %ld ",
-                               s.f_frsize, s.f_blocks, s.f_bsize, s.f_bavail);
+               SETTING_TRACE("f_frsize = %ld f_blocks = %ld f_bsize = %ld f_bavail = %ld ",
+                               (long)s.f_frsize, (long)s.f_blocks, (long)s.f_bsize, (long)s.f_bavail);
                *total = (double)s.f_frsize * s.f_blocks;
 #if 0
                *avail = (double)s.f_bsize * s.f_bavail;
 #else
                *avail = (double)s.f_bfree * s.f_frsize;
-               SETTING_TRACE("NEW STYLE, %ld", *avail);
+               SETTING_TRACE("NEW STYLE, %lf", *avail);
 #endif
        }
 }
@@ -323,7 +322,7 @@ static void storage_get_app_cache_size_cb(const package_size_info_h size_info,
        ad->sz_apps = (double)(app_size + ext_app_size);
        ad->sz_caches = (double)(cache_size + ext_cache_size);
 
-       SETTING_TRACE_DEBUG("size_info->app_size : %ld", ad->sz_apps);
+       SETTING_TRACE_DEBUG("size_info->app_size : %lf", ad->sz_apps);
        SETTING_TRACE_DEBUG("ad->sz_caches:%lf", ad->sz_caches);
 
        storage_genlist_text_update(ad->apps, ad->sz_apps);
@@ -509,7 +508,7 @@ void storage_select_all_items(SettingStorage *ad)
 
        SETTING_TRACE_DEBUG("ad->misces_is_select_all--->%d",
                                ad->misces_is_select_all);
-       SETTING_TRACE_DEBUG("ad->data_list--->%x", ad->data_list);
+       SETTING_TRACE_DEBUG("ad->data_list--->%p", ad->data_list);
        EINA_LIST_FOREACH(ad->data_list, l, node)
        {
                if (node && node->data) {

diff --git a/setting-time/src/setting-time-main.c b/setting-time/src/setting-time-main.c
index 102a0eeaf2e25fabf399be582983fd28f0f811b2..8204f5a966efe7e38586c0438f76009aa468a48c 100755 (executable)
--- a/setting-time/src/setting-time-main.c
+++ b/setting-time/src/setting-time-main.c
@@ -282,7 +282,7 @@ static void __update_time_via_sim_card(void *data)
        SETTING_TRACE("t_nitz:%d, t_offset:%d, t_uptime:%d", t_nitz, t_offset,
                        t_uptime);
        time_t t_current = t_nitz + t_uptime - t_offset;
-       SETTING_TRACE("t_current:%d", t_current);
+       SETTING_TRACE("t_current: %d", (int)t_current);
        ret = _alarmmgr_set_systime_helper(t_current);
        setting_retm_if(ret == -1, "_alarmmgr_set_systime_helper call failed");
        if (ad->data_time) {
@@ -838,7 +838,7 @@ static int setting_time_main_create(void *cb)
                        SETTING_TRACE("t_nitz:%d, t_offset:%d, t_uptime:%d",
                                        t_nitz, t_offset, t_uptime);
                        time_t t_current = t_nitz + t_uptime - t_offset;
-                       SETTING_TRACE("t_current:%d", t_current);
+                       SETTING_TRACE("t_current: %d", (int)t_current);
                        ret = _alarmmgr_set_systime_helper(t_current);
                        if (ret != ALARMMGR_RESULT_SUCCESS)
                                SETTING_TRACE_ERROR("Cannot set system time");
@@ -1647,9 +1647,8 @@ static char *get_timezone_displayname()
                }
 
                if (I18N_ERROR_NONE != status) {
-                       SETTING_TRACE_ERROR("i18n_ucalendar_get_timezone_displayname got "
-                                       "an error : %s, %d",
-                                       displayName, status);
+                       SETTING_TRACE_ERROR("i18n_ucalendar_get_timezone_displayname got an error : %s, %d",
+                                       (char *)displayName, status);
                        status = I18N_ERROR_NONE;
                } else {
                        int len = 0;
@@ -1665,8 +1664,8 @@ static char *get_timezone_displayname()
                        }
                        i18n_ustring_to_UTF8(timezone_str, len_str, &len_utf8,
                                        displayName, len, &status);
-                       SETTING_TRACE("*************************** timezone : "
-                                       "%s, %s", displayName, timezone_str);
+                       SETTING_TRACE("*************************** timezone : %s, %s", 
+                               (char *)displayName, (char *)timezone_str);
                }
                i18n_ucalendar_destroy(cal);
        }