From ca4a1c6927c897ad5bbfeb0aab6b65df7c94568f Mon Sep 17 00:00:00 2001 From: Jing Yigang Date: Fri, 31 Aug 2012 14:23:58 +0800 Subject: [PATCH] [Bug] remove some build warnings . Change-Id: Iccc1383af5bf6c09662f1d81a649243d47b878f7 --- setting-connectivity/src/setting-connectivity-usb.c | 2 +- setting-phone/include/setting-phone-region-format.h | 4 ---- setting-reset/src/setting-reset-main.c | 8 +++++--- setting-reset/src/setting-reset-settings.c | 10 ++++++---- src/conf_util/setting_confutil.c | 7 ++++++- 5 files changed, 18 insertions(+), 13 deletions(-) diff --git a/setting-connectivity/src/setting-connectivity-usb.c b/setting-connectivity/src/setting-connectivity-usb.c index 8583c42..7940598 100755 --- a/setting-connectivity/src/setting-connectivity-usb.c +++ b/setting-connectivity/src/setting-connectivity-usb.c @@ -1189,7 +1189,7 @@ static void usb_connection_response_cb(void *data, Evas_Object *obj, void *event void load_usb_connection_popup(void* data) { SETTING_TRACE_BEGIN; - int ret; + //int ret; SettingConnectivityUG *ad = (SettingConnectivityUG *)data; unload_popup(ad); diff --git a/setting-phone/include/setting-phone-region-format.h b/setting-phone/include/setting-phone-region-format.h index 15f4b05..1f043f9 100755 --- a/setting-phone/include/setting-phone-region-format.h +++ b/setting-phone/include/setting-phone-region-format.h @@ -47,10 +47,6 @@ static void setting_phone_region_format_mouse_up_Gendial_list_radio_cb(void *obj, void *event_info); -static void setting_phone_region_format_close_popup_ex(void *data); -static void setting_phone_region_format_exit_cb_ex(void *data, - Evas_Object *obj, - void *event_info); static int setting_phone_region_format_compare_cb(const void *d1, const void *d2); static int setting_phone_region_format_set_dateformat(const char *region, diff --git a/setting-reset/src/setting-reset-main.c b/setting-reset/src/setting-reset-main.c index 9da579b..9c5a9ad 100755 --- a/setting-reset/src/setting-reset-main.c +++ b/setting-reset/src/setting-reset-main.c @@ -312,7 +312,7 @@ static int setting_reset_main_cleanup(void *cb) /* execute /usr/bin/factory-reset after creating a process with fork() */ - +#if SUPPORT_SECURITY static void setting_reset_main_result_password_ug_cb(ui_gadget_h ug, service_h result, void *priv) @@ -392,7 +392,9 @@ static void setting_reset_main_destroy_password_ug_cb(ui_gadget_h ug, } } +#endif +#if SUPPORT_SECURITY static bool setting_reset_main_create_password_sg(void *data) { SETTING_TRACE_BEGIN; @@ -425,7 +427,7 @@ static bool setting_reset_main_create_password_sg(void *data) return TRUE; } - +#endif static void __ask_create_factory_reset_resp_cb(void *data, Evas_Object *obj, void *event_info) { @@ -435,7 +437,7 @@ static void __ask_create_factory_reset_resp_cb(void *data, Evas_Object *obj, ret_if(NULL == data); int response_type = btn_type(obj); - int screen_lock_type = 0; + //int screen_lock_type = 0; if (POPUP_RESPONSE_OK == response_type) { SETTING_TRACE("OK"); diff --git a/setting-reset/src/setting-reset-settings.c b/setting-reset/src/setting-reset-settings.c index bfb6a31..670488a 100755 --- a/setting-reset/src/setting-reset-settings.c +++ b/setting-reset/src/setting-reset-settings.c @@ -45,12 +45,13 @@ static void setting_reset_settings_click_softkey_reset_cb(void *data, static void setting_reset_settings_click_softkey_cancel_cb(void *data, Evas_Object *obj, void *event_info); - +#if SUPPORT_SECURITY static bool setting_reset_settings_create_password_sg(void *data); -static void setting_reset_settings_check_state(Setting_Done_List_Data *list_data); static void setting_reset_settings_result_password_ug_cb(ui_gadget_h ug, service_h result, void *priv); +#endif +static void setting_reset_settings_check_state(Setting_Done_List_Data *list_data); /* *************************************************** * @@ -549,6 +550,7 @@ static void setting_reset_settings_check_state(Setting_Done_List_Data *list_data } +#if SUPPORT_SECURITY static void setting_reset_settings_result_password_ug_cb(ui_gadget_h ug, service_h result, void *priv) @@ -664,7 +666,7 @@ static bool setting_reset_settings_create_password_sg(void *data) return TRUE; } - +#endif /* *************************************************** * *call back func @@ -693,7 +695,7 @@ setting_reset_settings_click_softkey_reset_cb(void *data, Evas_Object *obj, retm_if(data == NULL, "Data parameter is NULL"); SettingResetUG *ad = (SettingResetUG *) data; - int screen_lock_type = 0; + //int screen_lock_type = 0; //every time clicking 'Reset' button, restore following VCONFs vconf_set_bool(VCONFKEY_SETAPPL_FONT_CHANGED, FALSE); diff --git a/src/conf_util/setting_confutil.c b/src/conf_util/setting_confutil.c index 7f28d6a..0882cba 100755 --- a/src/conf_util/setting_confutil.c +++ b/src/conf_util/setting_confutil.c @@ -51,7 +51,9 @@ void timezone_init() char* tzpath = get_timezone(); //printf(">>> time zone : %s \n", tzpath+20); int ret = vconf_set_str(VCONFKEY_SETAPPL_TIMEZONE_INT, tzpath+20); - + if (ret != 0) { + SETTING_TRACE("fail to set vconf"); + } char str_buf[256] = {0, }; get_gmt_offset(str_buf, 256); printf(">>> time zone GMT string : %s \n", str_buf); @@ -61,6 +63,9 @@ void get_current_font() { char *value = NULL; int retcode = system_settings_get_value_string(SYSTEM_SETTINGS_KEY_FONT_TYPE, &value); + if (retcode != 0) { + SETTING_TRACE("fail to set SYSTEM_SETTINGS_KEY_FONT_TYPE"); + } printf(">>> get current font type : %s \n", value); } -- 2.34.1