backport: Fix incorrect usage of dlog_print() 99/197999/1
authorLukasz Stanislawski <l.stanislaws@samsung.com>
Thu, 17 Jan 2019 10:38:13 +0000 (11:38 +0100)
committerLukasz Stanislawski <l.stanislaws@samsung.com>
Thu, 17 Jan 2019 11:34:56 +0000 (12:34 +0100)
- dlog change : Apply __attribute__((format(printf..))) to internal __dlog_print()$

commit 5ef30f689c90f81358da5d70706cd6d6cb636b8f$
Author: Kiseok Chang <kiso.chang@samsung.com>$

Change-Id: I6c1bec0b0a72ae158ed285689d416631f5512842

15 files changed:
setting-common/src/setting-common-data-slp-setting.c
setting-common/src/setting-common-draw-popup.c
setting-display/src/setting-display-brightness.c
setting-font/src/setting-font-main.c
setting-language-and-input/src/setting-language-and-input.c
setting-network/src/setting-network-con-list.c
setting-network/src/setting-network-service-providers.c
setting-password/src/setting-password-sim.c
setting-profile-common/src/setting-profile-common.c
setting-profile-common/src/setting-profile-sound-main.c
setting-ringtone/src/setting-ringtone-util.c
setting-ringtone/src/setting-ringtone.c
setting-storage/src/setting-storage-main.c
setting-storage/src/setting-storage-utils.c
setting-time/src/setting-time-main.c

index 3df5d8873d02ee31da689b2160f18ccdca5a1571..7587f075fc5ea8423bbb3bcd01566602db3c2e77 100644 (file)
@@ -131,15 +131,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);
+                               node->type, node->value.b);
                break;
        case eINT:
                SETTING_TRACE("IMPORTING key : %s : %d : %d", node->vconf_key,
-                               node->type, node->value);
+                               node->type, node->value.i);
                break;
        case eSTRING:
                SETTING_TRACE("IMPORTING key : %s : %d : %s", node->vconf_key,
-                               node->type, node->value);
+                               node->type, node->value.c);
                break;
        }
 }
@@ -1017,7 +1017,7 @@ 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 ",
+                       "setting_set_str ::: KEY:%d VCONF_KEY=%s TYPE=%d " "VALUE=%s ",
                        result.key, result.vconf_key, result.type,
                        result.value.c);
        *err = ret;
index 9e07e619a66fd29833caaf7e0e8b365dc5d38e15..08261a284f845cfe952df47c30a086483b645a8f 100644 (file)
@@ -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);
        return popup;
index dcb0bac4f20d37efa0e2da2b68ff31403f2ca117..f56ea958c65c05f5877813d05bee19dfd2e6b1a7 100644 (file)
@@ -419,10 +419,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);
 }
@@ -727,7 +727,7 @@ void construct_brightness(void *data, Evas_Object *genlist)
        }
 
        left_icon = setting_brightness_get_slider_icon(value);
-       SETTING_TRACE("###> left_icon: [%d]", left_icon);
+       SETTING_TRACE("###> left_icon: [%s]", left_icon);
        /* [UI] Slider control for Bightness */
        ad->data_br_sli = setting_create_Gendial_field_def(
                        genlist,
index 4be4e70e9a81df02939bde5503d44198fd48f284..0ee8b5c9f89a3e1b9097df0028fc67e606c7bfce 100644 (file)
@@ -864,7 +864,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,
index d5a479ece93c72721bebe529b7aa61f2dfa9a514..51292e51f7d4d99dceb2c10275205f62a79652f8 100644 (file)
@@ -110,7 +110,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: %d", (int)ad->handle);
                memset(&(ad->imsi), 0, sizeof(TelSimImsiInfo_t));
                if (ad->handle
                                && TAPI_API_SUCCESS == tel_get_sim_imsi(
index ba637901a83ebbf54172a20773be252323488db6..80e539848144119d0bf098ee1bd3968b252460bd 100644 (file)
@@ -239,10 +239,10 @@ static int __con_list_recreate(void *cb)
                SETTING_TRACE_DEBUG(
                                ">>>> chk_status : <%d>, state_value_get for %s ---> (%d) value_get[%d], ptr : %x, org(%x)",
                                item_data->chk_status, item_data->keyStr,
-                               elm_radio_state_value_get(item_data->eo_check),
-                               elm_radio_value_get(item_data->eo_check),
-                               item_data->chk_change_cb,
-                               _chk_changed_cb);
+                               (int)elm_radio_state_value_get(item_data->eo_check),
+                               (int)elm_radio_value_get(item_data->eo_check),
+                               (unsigned int)item_data->chk_change_cb,
+                               (unsigned int)_chk_changed_cb);
                SETTING_TRACE("profile_h:%p, apn:%s, id:%s", profile_h, apn,
                                id);
 
@@ -534,8 +534,7 @@ static void __set_default_profile(Setting_GenGroupItem_Data *list_item)
                        SETTING_TRACE_ERROR("Fail to get profile id");
                        continue;
                }
-               SETTING_TRACE("Record[%d]: profile apn:%s, id:%s", cnt,
-                               profile_id);
+               SETTING_TRACE("Record[%d]: id:%s", cnt, profile_id);
 
                /* check id match */
                if (0 == safeStrCmp(profile_id, list_item->keyStr2)) {
index ae5e1ec0eda39d30e0d49193c53be8eaf90abe22..5e3dc9dc32ee6de261f162271587f85b10daf3a8 100644 (file)
@@ -1300,10 +1300,10 @@ static void _tapi_set_plmn_mode_cb(TapiHandle *handle, int result, void *data, v
        }
 
        if (0 != vconf_set_int(VCONFKEY_SETAPPL_SELECT_NETWORK_INT, s_info.sel_net))
-               SETTING_TRACE_ERROR("vconf[%s] set failed");
+               SETTING_TRACE_ERROR("vconf set failed");
 
        if (0 != vconf_set_int(VCONFKEY_SETAPPL_SELECT_OLD_NT_ACT, s_info.sel_act))
-               SETTING_TRACE_ERROR("vconf[%s] set failed");
+               SETTING_TRACE_ERROR("vconf set failed");
 
        s_info.b_set_manul_network = FALSE;
 
@@ -1397,10 +1397,10 @@ static void __selected_network_change_cb(keynode_t *key, void *data)
                        s_info.sel_network = strdup(Keystr_UNKNOWN_NETWORK);
 
                if (0 != vconf_set_int(VCONFKEY_SETAPPL_SELECT_NETWORK_INT, s_info.sel_net))
-                       SETTING_TRACE_ERROR("vconf[%s] set failed");
+                       SETTING_TRACE_ERROR("vconf set failed");
 
                if (0 != vconf_set_int(VCONFKEY_SETAPPL_SELECT_OLD_NT_ACT, s_info.sel_act))
-                       SETTING_TRACE_ERROR("vconf[%s] set failed");
+                       SETTING_TRACE_ERROR("vconf set failed");
 
        } else if (!safeStrCmp(vconf_name, VCONFKEY_TELEPHONY_FLIGHT_MODE)) {
                SETTING_TRACE("vconf_name:%s", vconf_name);
index 3df971f62f46b06052e17de5972d704c10bad891..ae8f4d924a8fcebe70cd86ee66a8b439c8b9e826 100644 (file)
@@ -1386,7 +1386,7 @@ static void setting_password_sim_done(void *data)
                                if (imf_context) {
                                        SETTING_TRACE_DEBUG(
                                                        "imf_context (0x%.8x) : clear event callbacks",
-                                                       imf_context);
+                                                       (unsigned int)imf_context);
                                        ecore_imf_context_input_panel_event_callback_clear(
                                                        imf_context);
                                }
@@ -1458,7 +1458,7 @@ static void setting_password_sim_done(void *data)
                                if (imf_context) {
                                        SETTING_TRACE_DEBUG(
                                                        "imf_context (0x%.8x) : clear event callbacks",
-                                                       imf_context);
+                                                       (unsigned int)imf_context);
                                        ecore_imf_context_input_panel_event_callback_clear(
                                                        imf_context);
                                }
@@ -1745,7 +1745,7 @@ void setting_get_pin_lock_info_cb(TapiHandle *handle, int result, void *data,
 
        SETTING_TRACE_SECURE_DEBUG(
                        "sec_ret[%d], lock_type[%d], lock_status[%d], retry_count[%d]",
-                       sec_rt, lock->lock_type, lock->lock_status,
+                       (int)sec_rt, lock->lock_type, lock->lock_status,
                        lock->retry_count);
 
        char temp[256] = { 0, };
index 36f5fc74d21accbe38535bc123bd2a2c5bd31b5e..52fe10088e2068822b003f40a9da520ba5ea30e3 100644 (file)
@@ -380,7 +380,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 (%x)", (unsigned int)ad->mp_prepare_async);
 #else
        err = player_prepare(ad->mp_player);
        if (err != PLAYER_ERROR_NONE) {
@@ -1293,9 +1293,9 @@ 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 (%x)", (unsigned int)ad->mp_prepare_async);
        err = player_get_state(ad->mp_player, &state);
-       SETTING_TRACE("state:%d", state);
+       SETTING_TRACE("state:%d", (int)state);
 
        if (state != PLAYER_STATE_READY) {
                SETTING_TRACE_ERROR(
@@ -1341,11 +1341,11 @@ static void __sound_stream_focus_state_changed_cb(
        SettingSoundData *ad = (SettingSoundData *)user_data;
        ret_if(ad == NULL);
 
-       SETTING_TRACE_ERROR("Focus state changed, reason: %d", reason);
+       SETTING_TRACE_ERROR("Focus state changed, reason: %d", (int)reason);
 
        if (ad->mp_player) {
                player_get_state(ad->mp_player, &state);
-               SETTING_TRACE("player state : %d", state);
+               SETTING_TRACE("player state : %d", (int)state);
        }
 }
 
index 32df4436d9afa15bf68036c8791f8eeaa2fb3bd0..f14108245518e8be294c984272f4643acd1b0dab 100644 (file)
@@ -803,7 +803,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) {
index 2fa2b1bd44bac8c5961923c1f2fa21f21d858a64..eec860a7b5d4cb0ea48c425b0eee698054d3d7de 100644 (file)
@@ -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;
index f59227c6ea752ac43e4611b0425e29d8148d032c..93a4aa9a4e89867af561a4a1f7d49a19a5647dd2 100644 (file)
@@ -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;
        }
 
index 3ae32f610ed3ff75d565b4313d10ea6e4ea17fad..a772bd3e8552a5fb31682b036c561d3b6d4b592b 100644 (file)
@@ -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));
index a9bbaec9f9c12e7ff1b3523b031d5aab8d2491c2..52bd6e38e3207df8ad6fa56620b2b3111905d1aa 100644 (file)
@@ -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);
@@ -500,7 +499,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--->%x", (unsigned int)ad->data_list);
        EINA_LIST_FOREACH(ad->data_list, l, node)
        {
                if (node && node->data) {
index da925027bec217e053d4e3da298793d78f2061c9..955b143b66ba89729171aadcb7a3f7a0f2bfa103 100644 (file)
@@ -283,7 +283,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) {
@@ -833,7 +833,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");
@@ -1646,7 +1646,7 @@ 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);
+                                       (char*)displayName, (int)status);
                        status = I18N_ERROR_NONE;
                } else {
                        int len = 0;
@@ -1663,7 +1663,7 @@ 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);
+                                       "%s, %s", (char*)displayName, timezone_str);
                }
                i18n_ucalendar_destroy(cal);
        }