From: Sungmin Kwak Date: Mon, 14 Sep 2015 04:21:30 +0000 (+0900) Subject: Add null check codes and remove the warning X-Git-Tag: submit/tizen/20150922.065531~15 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0b4471bf410f3968b94fc9eca79e1c7bbe9d1c15;p=platform%2Fcore%2Fuifw%2Finputmethod-setting.git Add null check codes and remove the warning Change-Id: Ife0c641066647e0cc2fc9f85bb6414a23f8669be --- diff --git a/im_setting_list/input_method_setting_list_popup_view.cpp b/im_setting_list/input_method_setting_list_popup_view.cpp index d389ed5..5fd8397 100644 --- a/im_setting_list/input_method_setting_list_popup_view.cpp +++ b/im_setting_list/input_method_setting_list_popup_view.cpp @@ -133,8 +133,12 @@ static void im_setting_list_update_radio_state(Elm_Object_Item *item, Evas_Objec static void im_setting_list_ime_sel_cb(void *data, Evas_Object *obj, void *event_info) { sel_cb_data * cb_data = (sel_cb_data *)data; - int index = cb_data->index; + if (!cb_data) + return; appdata *ad = (appdata *)cb_data->data; + if (!ad) + return; + int index = cb_data->index; Elm_Object_Item *item = (Elm_Object_Item *)event_info; if (!item){ @@ -153,6 +157,8 @@ static void im_setting_list_ime_sel_cb(void *data, Evas_Object *obj, void *event static Evas_Object *im_setting_list_genlist_create(Evas_Object* parent) { + if (!parent) + return NULL; Evas_Object *genlist = elm_genlist_add(parent); elm_genlist_mode_set(genlist, ELM_LIST_COMPRESS); elm_genlist_homogeneous_set (genlist, EINA_TRUE); @@ -220,6 +226,8 @@ static void im_setting_list_genlist_item_class_create(void) static Evas_Object *im_setting_list_list_create(void *data) { appdata *ad = (appdata *)data; + if (!ad) + return NULL; im_setting_list_genlist_item_class_create(); Evas_Object *genlist = NULL; genlist = im_setting_list_genlist_create(ad->popup); @@ -259,6 +267,8 @@ static void im_setting_list_popup_block_clicked_cb(void *data EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED) { appdata *ad = (appdata *)data; + if (!ad) + return; if (ad->popup) { evas_object_del(ad->popup); } @@ -268,6 +278,8 @@ im_setting_list_popup_block_clicked_cb(void *data EINA_UNUSED, Evas_Object *obj, static void im_setting_list_popup_view_back_cb(void *data, Evas_Object *obj, void *event_info) { appdata *ad = (appdata *)data; + if (!ad) + return; eext_object_event_callback_del(obj, EEXT_CALLBACK_BACK, im_setting_list_popup_view_back_cb); if (ad->popup) { evas_object_del(ad->popup); @@ -278,6 +290,8 @@ static void im_setting_list_popup_view_back_cb(void *data, Evas_Object *obj, voi static Evas_Object *im_setting_list_popup_create(void *data) { appdata *ad = (appdata *)data; + if (!ad || !ad->win) + return NULL; Evas_Object *parentWin = ad->win; if (NULL == group_radio) { @@ -303,7 +317,7 @@ void im_setting_list_popup_view_create(void *data) { appdata *ad = (appdata *)data; - if (!ad->win) + if (!ad || !ad->win) return; im_setting_list_load_active_ime_info(); im_setting_list_popup_create(data); diff --git a/im_setting_list/input_method_setting_list_ui.cpp b/im_setting_list/input_method_setting_list_ui.cpp index 0a0f5cb..95f3f04 100644 --- a/im_setting_list/input_method_setting_list_ui.cpp +++ b/im_setting_list/input_method_setting_list_ui.cpp @@ -184,6 +184,8 @@ static void im_setting_list_check_popup_ok_cb(void *data, Evas_Object *obj, void *event_info) { popup_cb_data *cb_data = (popup_cb_data *)data; + if (!cb_data) + return; int index = (int)reinterpret_cast(cb_data->data); if (index < 0 || index >= (int)g_ime_info_list.size()) { LOGW("Wrong value. index : %d, g_ime_info_list.size() : %d\n", index, g_ime_info_list.size()); @@ -201,6 +203,8 @@ static void im_setting_list_check_popup_cancel_cb(void *data, Evas_Object *obj, void *event_info) { popup_cb_data *cb_data = (popup_cb_data *)data; + if (!cb_data) + return; int index = (int)reinterpret_cast(cb_data->data); if (index < 0 || index >= (int)g_ime_info_list.size()) { LOGW("Wrong value. index : %d, g_ime_info_list.size() : %d\n", index, g_ime_info_list.size()); @@ -220,6 +224,8 @@ static void _popup_back_cb(void *data, Evas_Object *obj, void *event_info) { eext_object_event_callback_del(obj, EEXT_CALLBACK_BACK, _popup_back_cb); popup_cb_data *cb_data = (popup_cb_data *)data; + if (!cb_data) + return; int index = (int)(cb_data->data); if (index < 0 || index >= (int)g_ime_info_list.size()) { LOGW("Wrong value. index : %d, g_ime_info_list.size() : %d\n", index, g_ime_info_list.size()); @@ -298,6 +304,8 @@ static void im_setting_list_popup_ok_cb(void *data, Evas_Object *obj, void *event_info) { popup_cb_data *cb_data = (popup_cb_data *)data; + if (!cb_data) + return; int index = (int)reinterpret_cast(cb_data->data); if (index < 0 || index >= (int)g_ime_info_list.size()) { LOGW("Wrong value. index : %d, g_ime_info_list.size() : %d\n", index, g_ime_info_list.size()); @@ -317,6 +325,8 @@ static void im_setting_list_popup_cancel_cb(void *data, Evas_Object *obj, void *event_info) { popup_cb_data *cb_data = (popup_cb_data *)data; + if (!cb_data) + return; evas_object_del(cb_data->popup); delete cb_data; } @@ -357,7 +367,6 @@ static void im_setting_list_item_sel_cb(void *data, Evas_Object *obj, void *even static void im_setting_list_set_default_keyboard_item_sel_cb(void *data, Evas_Object *obj, void *event_info) { - appdata *ad = (appdata *)data; Elm_Object_Item *item = (Elm_Object_Item *)event_info; elm_genlist_item_selected_set (item, EINA_FALSE); im_setting_list_popup_view_create(data); @@ -404,6 +413,8 @@ static Evas_Object *im_setting_list_genlist_create(Evas_Object* parent) static char *im_setting_list_genlist_group_label_get(void *data, Evas_Object *obj, const char *part) { char *text = (char *)data; + if (!text) + return NULL; if (!strcmp(part, "elm.text")) { return strdup(text); } @@ -456,6 +467,8 @@ static Evas_Object *im_setting_list_genlist_keyboard_list_item_icon_get(void *da static char *im_setting_list_genlist_item_label_get(void *data, Evas_Object *obj, const char *part) { list_item_text *item_text = (list_item_text *)data; + if (!item_text) + return NULL; if (!strcmp(part, "elm.text.main.left.top") || !strcmp(part, "elm.text.main.left") || !strcmp(part, "elm.text.main") || @@ -476,6 +489,8 @@ static char *im_setting_list_genlist_item_label_get(void *data, Evas_Object *obj static char *im_setting_list_genlist_item_one_line_label_get(void *data, Evas_Object *obj, const char *part) { list_item_text *item_text = (list_item_text *)data; + if (!item_text) + return NULL; if (!strcmp(part, "elm.text.main.left.top") || !strcmp(part, "elm.text.main.left") || !strcmp(part, "elm.text.main") || @@ -559,6 +574,8 @@ static void im_setting_list_genlist_item_class_create(int app_type) static void im_setting_list_add_ime(void *data) { appdata *ad = (appdata *)data; int i = 0; + if (!ad) + return; im_setting_list_genlist_item_class_create(ad->app_type); if (NULL != ad->genlist) @@ -660,6 +677,8 @@ static void im_setting_list_navi_back_btn_call_cb(void *data, Evas_Object *obj, Evas_Object *im_setting_list_list_create(void *data) { appdata *ad = (appdata *)data; + if (!ad) + return NULL; ad->conform = im_setting_list_conform_create(ad->win); ad->naviframe = im_setting_list_naviframe_create(ad->conform); ad->genlist = im_setting_list_genlist_create(ad->naviframe); @@ -708,6 +727,8 @@ void im_setting_list_app_terminate(void *data) void im_setting_list_update_window(void *data) { appdata *ad = (appdata *)data; + if (!ad) + return; im_setting_list_load_ime_info(); im_setting_list_add_ime(ad); } diff --git a/im_setting_selector/input_method_setting_selector.cpp b/im_setting_selector/input_method_setting_selector.cpp index bfe0315..f80b091 100644 --- a/im_setting_selector/input_method_setting_selector.cpp +++ b/im_setting_selector/input_method_setting_selector.cpp @@ -38,7 +38,6 @@ app_control(app_control_h app_control, void *data) { /* Handle the launch request. */ appdata *ad = (appdata *)data; - int res; LOGD(""); diff --git a/im_setting_selector/input_method_setting_selector_ui.cpp b/im_setting_selector/input_method_setting_selector_ui.cpp index ba216eb..fdc9fde 100644 --- a/im_setting_selector/input_method_setting_selector_ui.cpp +++ b/im_setting_selector/input_method_setting_selector_ui.cpp @@ -199,8 +199,9 @@ static void im_setting_selector_update_radio_state(Elm_Object_Item *item, Evas_O static void im_setting_selector_ime_sel_cb(void *data, Evas_Object *obj, void *event_info) { sel_cb_data * cb_data = (sel_cb_data *)data; + if (!cb_data) + return; int index = cb_data->index; - appdata *ad = (appdata *)(cb_data->data); Elm_Object_Item *item = (Elm_Object_Item *)event_info; if (!item) @@ -279,6 +280,8 @@ static void im_setting_selector_genlist_item_class_create(void) static void im_setting_selector_add_ime(void *data) { appdata *ad = (appdata *)data; unsigned int i = 0; + if (!ad) + return; im_setting_selector_genlist_item_class_create(); /* keyboard list */ @@ -300,6 +303,8 @@ static void im_setting_selector_add_ime(void *data) { Evas_Object *im_setting_selector_list_create(void *data) { appdata *ad = (appdata *)data; + if (!ad) + return NULL; ad->genlist = im_setting_selector_genlist_create(ad->popup); im_setting_selector_add_ime(ad); return ad->genlist; @@ -339,6 +344,8 @@ im_setting_selector_popup_block_clicked_cb(void *data EINA_UNUSED, Evas_Object * Evas_Object *im_setting_selector_popup_create(void *data) { appdata *ad = (appdata *)data; + if (!ad) + return NULL; if (NULL == group_radio) { group_radio = elm_radio_add(ad->win);