From: Radoslaw Czerski Date: Fri, 12 Aug 2016 08:30:28 +0000 (+0200) Subject: Coding style fixes. X-Git-Tag: submit/tizen/20160812.094339~2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4d8b395a22008983853cda7ebfac6ebe1586c6ac;p=profile%2Fmobile%2Fapps%2Fnative%2Findicator.git Coding style fixes. Change-Id: I054d6b532db92b00ec564aaef6b4a67dd8243eb9 Signed-off-by: Radoslaw Czerski --- diff --git a/src/modules/connection/connection.c b/src/modules/connection/connection.c index 37a42d1..beae77e 100644 --- a/src/modules/connection/connection.c +++ b/src/modules/connection/connection.c @@ -110,7 +110,7 @@ static void show_connection_transfer_icon(void *data) return; } - _D("type %d",state); + _D("type %d", state); transfer_state = state; switch (state) { diff --git a/src/modules/connection/dock.c b/src/modules/connection/dock.c index 6712e10..ec8927b 100644 --- a/src/modules/connection/dock.c +++ b/src/modules/connection/dock.c @@ -18,7 +18,6 @@ */ - #include #include #include @@ -56,20 +55,16 @@ static const char *icon_path[] = { }; - -static void set_app_state(void* data) +static void set_app_state(void *data) { dock.ad = data; } - static void show_image_icon(void) { - if(bShown == 1) - { + if (bShown == 1) return; - } dock.img_obj.data = icon_path[0]; icon_show(&dock); @@ -78,7 +73,6 @@ static void show_image_icon(void) } - static void hide_image_icon(void) { icon_hide(&dock); @@ -87,7 +81,6 @@ static void hide_image_icon(void) } - static void indicator_dock_change_cb(keynode_t *node, void *data) { int status; @@ -97,50 +90,41 @@ static void indicator_dock_change_cb(keynode_t *node, void *data) /* First, check dock status */ ret = vconf_get_int(VCONFKEY_SYSMAN_CRADLE_STATUS, &status); + _D("dock Status: %d", status); + if (ret == OK) { - if (status > 0) { - _D("dock Status: %d", status); + if (status > 0) show_image_icon(); - } else - { hide_image_icon(); - } } return; } - static int register_dock_module(void *data) { - int r = 0, ret = -1; + int ret = -1; retvm_if(data == NULL, FAIL, "Invalid parameter!"); set_app_state(data); - ret = vconf_notify_key_changed(VCONFKEY_SYSMAN_CRADLE_STATUS, - indicator_dock_change_cb, data); - if (ret != OK) - { - r = ret; - } + ret = vconf_notify_key_changed(VCONFKEY_SYSMAN_CRADLE_STATUS, indicator_dock_change_cb, data); + retvm_if(ret != OK, FAIL, "vconf_notify_key_changed failed"); indicator_dock_change_cb(NULL, data); - return r; + return ret; } - static int unregister_dock_module(void) { int ret; - ret = vconf_ignore_key_changed(VCONFKEY_SYSMAN_CRADLE_STATUS, - indicator_dock_change_cb); + ret = vconf_ignore_key_changed(VCONFKEY_SYSMAN_CRADLE_STATUS, indicator_dock_change_cb); return ret; } diff --git a/src/modules/connection/mobile_hotspot.c b/src/modules/connection/mobile_hotspot.c index 4c03f88..5eb4a72 100644 --- a/src/modules/connection/mobile_hotspot.c +++ b/src/modules/connection/mobile_hotspot.c @@ -18,7 +18,6 @@ */ - #include #include #include diff --git a/src/modules/connection/usb.c b/src/modules/connection/usb.c index 7eb3a7d..34a07e7 100644 --- a/src/modules/connection/usb.c +++ b/src/modules/connection/usb.c @@ -18,7 +18,6 @@ */ - #include #include #include @@ -59,8 +58,7 @@ static const char *icon_path[] = { static int bShown = 0; - -static void set_app_state(void* data) +static void set_app_state(void *data) { usb.ad = data; } diff --git a/src/modules/home/search.c b/src/modules/home/search.c index 2e2a9c3..f59c7fc 100644 --- a/src/modules/home/search.c +++ b/src/modules/home/search.c @@ -18,7 +18,6 @@ */ - #ifndef _INDICATOR_REMOVE_SEARCH #include #include @@ -66,14 +65,12 @@ static const char *icon_path[] = { }; - static void set_app_state(void *data) { search.ad = data; } - static void show_image_icon(int index) { search.img_obj.data = icon_path[index]; @@ -81,28 +78,24 @@ static void show_image_icon(int index) } - static void hide_image_icon(void) { icon_hide(&search); } - EXPORT_PUBLIC void hide_search_icon(void) { hide_image_icon(); } - EXPORT_PUBLIC void show_search_icon(void) { show_image_icon(0); } - static void _handle_search_icon(void *data) { int lock_status = -1; @@ -134,7 +127,6 @@ static void _handle_search_icon(void *data) } - static void _lock_status_cb(system_settings_key_e key, void *data) { _D("lock state change"); @@ -142,7 +134,6 @@ static void _lock_status_cb(system_settings_key_e key, void *data) } - static int register_search_module(void *data) { int ret = FAIL; @@ -160,7 +151,6 @@ static int register_search_module(void *data) } - static int unregister_search_module(void) { util_system_settings_unset_changed_cb(SYSTEM_SETTINGS_KEY_LOCK_STATE, _lock_status_cb); @@ -169,7 +159,6 @@ static int unregister_search_module(void) } - #ifdef _SUPPORT_SCREEN_READER static void _apptray_access_cb(void *data, Evas_Object *obj, Elm_Object_Item *item) { @@ -177,7 +166,6 @@ static void _apptray_access_cb(void *data, Evas_Object *obj, Elm_Object_Item *it } - static char *_access_info_cb(void *data, Evas_Object *obj) { Evas_Object *item = data; @@ -190,7 +178,6 @@ static char *_access_info_cb(void *data, Evas_Object *obj) } - static int register_search_tts(void *data) { int r = 0; diff --git a/src/modules/information/alarm.c b/src/modules/information/alarm.c index a32c0b4..ed31c77 100644 --- a/src/modules/information/alarm.c +++ b/src/modules/information/alarm.c @@ -63,7 +63,7 @@ static char *icon_path[] = { -static void set_app_state(void* data) +static void set_app_state(void *data) { useralarm.ad = data; } @@ -72,10 +72,8 @@ static void set_app_state(void* data) static void show_image_icon(void *data) { - if(bShown == 1) - { + if (bShown == 1) return; - } useralarm.img_obj.data = icon_path[0]; icon_show(&useralarm); @@ -128,10 +126,8 @@ static char *access_info_cb(void *data, Evas_Object *obj) vconf_get_int(VCONFKEY_ALARM_STATE, &status); - if(status>0) - { - snprintf(buf, sizeof(buf), "%s, %s, %s", _("IDS_COM_BODY_ALARM"),_("IDS_IDLE_BODY_ICON"),_("IDS_IDLE_BODY_STATUS_BAR_ITEM")); - } + if (status > 0) + snprintf(buf, sizeof(buf), "%s, %s, %s", _("IDS_COM_BODY_ALARM"), _("IDS_IDLE_BODY_ICON"), _("IDS_IDLE_BODY_STATUS_BAR_ITEM")); tmp = strdup(buf); if (!tmp) return NULL; diff --git a/src/modules/information/earphone.c b/src/modules/information/earphone.c index 473b83a..2e6db3e 100644 --- a/src/modules/information/earphone.c +++ b/src/modules/information/earphone.c @@ -31,8 +31,6 @@ #define MODULE_NAME "earphone" #define TIMER_INTERVAL 0.3 -//#define _(str) gettext(str) - static int register_earphone_module(void *data); static int unregister_earphone_module(void); static int wake_up_cb(void *data); @@ -59,14 +57,14 @@ static int bShown = 0; -static void set_app_state(void* data) +static void set_app_state(void *data) { earphone.ad = data; } static void show_image_icon(void) { - if(bShown == 1) + if (bShown == 1) return; earphone.img_obj.data = icon_path[0]; @@ -90,10 +88,11 @@ void check_jack_port(void *data) retm_if(data == NULL, "Invalid parameter!"); - if(icon_get_update_flag()==0) { + if (!icon_get_update_flag()) { updated_while_lcd_off = 1; return; } + updated_while_lcd_off = 0; ret = runtime_info_get_value_bool(RUNTIME_INFO_KEY_AUDIO_JACK_CONNECTED, &is_jack_connected); retm_if(ret != RUNTIME_INFO_ERROR_NONE, "runtime_info_get_value_bool failed[%s]", get_error_message(ret)); @@ -104,8 +103,7 @@ void check_jack_port(void *data) if (is_jack_connected || is_tv_out_connected) { _D("Earphone connected"); show_image_icon(); - } - else + } else hide_image_icon(); } @@ -116,7 +114,7 @@ void indicator_earphone_change_cb(runtime_info_key_e key, void *data) static int wake_up_cb(void *data) { - if(updated_while_lcd_off == 0) + if (updated_while_lcd_off == 0) return OK; check_jack_port(data); diff --git a/src/modules/information/ext_storage.c b/src/modules/information/ext_storage.c index 13e7c32..5f91c73 100644 --- a/src/modules/information/ext_storage.c +++ b/src/modules/information/ext_storage.c @@ -95,7 +95,7 @@ static void _ext_storage_cb(keynode_t *node, void *user_data) int storage_status; - if(icon_get_update_flag() == 0) { + if (!icon_get_update_flag()) { updated_while_lcd_off = 1; return; } @@ -122,7 +122,7 @@ static void _ext_storage_cb(keynode_t *node, void *user_data) static int wake_up_cb(void *data) { - if(updated_while_lcd_off == 0) + if (updated_while_lcd_off == 0) return OK; _ext_storage_cb(NULL, data); diff --git a/src/modules/information/fm_radio.c b/src/modules/information/fm_radio.c index 1944fdf..0443b90 100644 --- a/src/modules/information/fm_radio.c +++ b/src/modules/information/fm_radio.c @@ -17,7 +17,7 @@ * */ -// TODO No possibility to be notified about radio status for now. +/* TODO No possibility to be notified about radio status for now. */ #include #include @@ -53,14 +53,12 @@ static char *icon_path[] = { }; - -static void set_app_state(void* data) +static void set_app_state(void *data) { fm_radio.ad = data; } - static void show_image_icon(void *data) { fm_radio.img_obj.data = icon_path[0]; @@ -68,14 +66,12 @@ static void show_image_icon(void *data) } - static void hide_image_icon(void) { icon_hide(&fm_radio); } - static void indicator_fm_radio_change_cb(void *data) { int status = 0; @@ -90,23 +86,19 @@ static void indicator_fm_radio_change_cb(void *data) show_image_icon(data); else hide_image_icon(); - } - else - { + } else _D("Fail to get vconfkey (ret:%d)", ret); - } + return; } - void hide_fm_radio_icon(void) { hide_image_icon(); } - static int register_fm_radio_module(void *data) { int ret = -1; @@ -122,7 +114,6 @@ static int register_fm_radio_module(void *data) } - static int unregister_fm_radio_module(void) { _D("unregister_fm_radio_module called!"); diff --git a/src/modules/information/more_notify.c b/src/modules/information/more_notify.c index 50187d2..0c93a4d 100644 --- a/src/modules/information/more_notify.c +++ b/src/modules/information/more_notify.c @@ -63,6 +63,11 @@ static void set_app_state(void *data) more_notify.ad = data; } +icon_s *more_noti_get_icon(void) +{ + return &more_notify; +} + void indicator_more_notify_icon_change(Eina_Bool val) { _D("indicator_more_notify_change. Val=%s", (val) ? "true" : "false"); diff --git a/src/modules/information/toast_popup.c b/src/modules/information/toast_popup.c index 5fc983f..b03ee19 100644 --- a/src/modules/information/toast_popup.c +++ b/src/modules/information/toast_popup.c @@ -64,7 +64,7 @@ static void _popup_timeout_cb(void *data, Evas_Object *obj, void *event_info) evas_object_del((Evas_Object *)data); /* toast window */ count = eina_list_count(s_info.toast_list); - if (count == 1){ + if (count == 1) { msg = (char *)eina_list_nth(s_info.toast_list, 0); free(msg); @@ -89,7 +89,7 @@ static void _post_toast_message(char *message) if (elm_win_wm_rotation_supported_get(toast_window)) { int rots[4] = { 0, 90, 180, 270 }; - elm_win_wm_rotation_available_rotations_set(toast_window, (const int*)(&rots), 4); + elm_win_wm_rotation_available_rotations_set(toast_window, (const int *)(&rots), 4); } elm_win_role_set(toast_window, "notification-normal"); evas_object_show(toast_window); @@ -157,8 +157,7 @@ static void _post_toast_message_callback(const char *message, void *data) } else { s_info.toast_list = eina_list_append(s_info.toast_list, msg); } - } - else + } else free(msg); return;