From fca2fb30c91237b5162a01e47b2b1b504afc2dab Mon Sep 17 00:00:00 2001 From: Gustavo Sverzut Barbieri Date: Tue, 2 Mar 2010 01:27:08 +0000 Subject: [PATCH] fix most llvm/gcc real bugs. SVN revision: 46762 --- legacy/elementary/src/bin/run.c | 1 - legacy/elementary/src/bin/test_genlist.c | 8 ++++---- legacy/elementary/src/bin/test_map.c | 13 +++++-------- legacy/elementary/src/bin/test_progressbar.c | 3 +-- legacy/elementary/src/lib/elc_notepad.c | 2 +- legacy/elementary/src/lib/elm_index.c | 2 +- legacy/elementary/src/lib/elm_radio.c | 4 ++-- legacy/elementary/src/lib/elm_slideshow.c | 8 +++++++- legacy/elementary/src/lib/els_icon.c | 5 +++++ 9 files changed, 26 insertions(+), 20 deletions(-) diff --git a/legacy/elementary/src/bin/run.c b/legacy/elementary/src/bin/run.c index 8941665d8d..4177a7d812 100644 --- a/legacy/elementary/src/bin/run.c +++ b/legacy/elementary/src/bin/run.c @@ -68,7 +68,6 @@ main(int argc, char **argv) if (path) { const char *p, *pp, *s; - int exelen; p = path; pp = p; diff --git a/legacy/elementary/src/bin/test_genlist.c b/legacy/elementary/src/bin/test_genlist.c index 5f5807ef57..6cf9ec5abe 100644 --- a/legacy/elementary/src/bin/test_genlist.c +++ b/legacy/elementary/src/bin/test_genlist.c @@ -572,7 +572,7 @@ test_genlist3(void *data, Evas_Object *obj, void *event_info) NULL/* func data */); elm_box_pack_end(bx, gl); - evas_object_show(bx2); + evas_object_show(bx); bx2 = elm_box_add(win); elm_box_horizontal_set(bx2, 1); @@ -728,7 +728,7 @@ test_genlist4(void *data, Evas_Object *obj, void *event_info) NULL/* func data */); elm_box_pack_end(bx, gl); - evas_object_show(bx2); + evas_object_show(bx); bx2 = elm_box_add(win); elm_box_horizontal_set(bx2, 1); @@ -924,7 +924,7 @@ test_genlist5(void *data, Evas_Object *obj, void *event_info) NULL/* func data */); elm_box_pack_end(bx, gl); - evas_object_show(bx2); + evas_object_show(bx); evas_object_smart_callback_add(gl, "drag,start,up", item_drag_up, NULL); evas_object_smart_callback_add(gl, "drag,start,down", item_drag_down, NULL); @@ -1097,7 +1097,7 @@ test_genlist6(void *data, Evas_Object *obj, void *event_info) evas_object_smart_callback_add(gl, "contracted", gl4_con, gl); elm_box_pack_end(bx, gl); - evas_object_show(bx2); + evas_object_show(bx); bx2 = elm_box_add(win); elm_box_horizontal_set(bx2, 1); diff --git a/legacy/elementary/src/bin/test_map.c b/legacy/elementary/src/bin/test_map.c index 0a9cfdb58d..4adbb1f0ae 100644 --- a/legacy/elementary/src/bin/test_map.c +++ b/legacy/elementary/src/bin/test_map.c @@ -260,14 +260,11 @@ my_bt_add(void *data, Evas_Object *obj, void *event_info) d = &data_parking; } - if(!style || style == 1) - { - style = rand() % 2; - if(!style) - g_clas = itc_group1; - else if(style == 1) - g_clas = itc_group2; - } + style = rand() % 2; + if (!style) + g_clas = itc_group1; + else + g_clas = itc_group2; elm_map_marker_add(data, r1/100., r2/100., m_clas, g_clas, d); } diff --git a/legacy/elementary/src/bin/test_progressbar.c b/legacy/elementary/src/bin/test_progressbar.c index d7d2798182..a1904cf71d 100644 --- a/legacy/elementary/src/bin/test_progressbar.c +++ b/legacy/elementary/src/bin/test_progressbar.c @@ -69,13 +69,12 @@ void test_progressbar(void *data, Evas_Object *obj, void *event_info) { Evas_Object *win, *bg, *pb, *bx, *pbx, *hbx, *bt, *bt_bx, *ic1, *ic2; - Progressbar *test; char buf[PATH_MAX]; win = elm_win_add(NULL, "progressbar", ELM_WIN_BASIC); elm_win_title_set(win, "Progressbar"); evas_object_smart_callback_add(win, "delete,request", - my_progressbar_destroy, test); + my_progressbar_destroy, NULL); bg = elm_bg_add(win); elm_win_resize_object_add(win, bg); diff --git a/legacy/elementary/src/lib/elc_notepad.c b/legacy/elementary/src/lib/elc_notepad.c index 6d945f4e5f..2550ccdf89 100644 --- a/legacy/elementary/src/lib/elc_notepad.c +++ b/legacy/elementary/src/lib/elc_notepad.c @@ -135,7 +135,7 @@ _load(Evas_Object *obj) break; default: elm_entry_entry_set(wd->entry, "Unknown Text Format"); - break; + text = NULL; } if (text) { diff --git a/legacy/elementary/src/lib/elm_index.c b/legacy/elementary/src/lib/elm_index.c index 455578448a..db036859b5 100644 --- a/legacy/elementary/src/lib/elm_index.c +++ b/legacy/elementary/src/lib/elm_index.c @@ -107,7 +107,7 @@ _theme_hook(Evas_Object *obj) { if (!wd->event[1]) { - Evas_Coord minw, minh; + Evas_Coord minw = 0, minh = 0; wd->event[1] = evas_object_rectangle_add(evas_object_evas_get(wd->base)); evas_object_color_set(wd->event[1], 0, 0, 0, 0); diff --git a/legacy/elementary/src/lib/elm_radio.c b/legacy/elementary/src/lib/elm_radio.c index 1f9d28d755..8982a04b34 100644 --- a/legacy/elementary/src/lib/elm_radio.c +++ b/legacy/elementary/src/lib/elm_radio.c @@ -161,7 +161,7 @@ static void _state_set_all(Widget_Data *wd) { const Eina_List *l; - Evas_Object *child, *selected; + Evas_Object *child, *selected = NULL; Eina_Bool disabled = EINA_FALSE; EINA_LIST_FOREACH(wd->group->radios, l, child) @@ -176,7 +176,7 @@ _state_set_all(Widget_Data *wd) else _state_set(child, 0); } - if (disabled) _state_set(selected, 1); + if (disabled && selected) _state_set(selected, 1); } static void diff --git a/legacy/elementary/src/lib/elm_slideshow.c b/legacy/elementary/src/lib/elm_slideshow.c index 05d1745ec2..3e708faf9b 100644 --- a/legacy/elementary/src/lib/elm_slideshow.c +++ b/legacy/elementary/src/lib/elm_slideshow.c @@ -311,8 +311,11 @@ elm_slideshow_next(Evas_Object *obj) if (!wd) return; - if(wd->current) + if (wd->current) next = eina_list_data_get(eina_list_next(wd->current->l)); + else + next = NULL; + if(wd->current && !next && wd->loop) next = eina_list_data_get(wd->items); @@ -352,6 +355,9 @@ elm_slideshow_previous(Evas_Object *obj) if(wd->current) prev = eina_list_data_get(eina_list_prev(wd->current->l)); + else + prev = NULL; + if(wd->current && !prev && wd->loop) prev = eina_list_data_get(eina_list_last(wd->items)); diff --git a/legacy/elementary/src/lib/els_icon.c b/legacy/elementary/src/lib/els_icon.c index 90e6bbe639..d3743f7a67 100644 --- a/legacy/elementary/src/lib/els_icon.c +++ b/legacy/elementary/src/lib/els_icon.c @@ -230,6 +230,11 @@ _els_smart_icon_orient_set(Evas_Object *obj, Elm_Image_Orient orient) w = -w; hw = hw + 1; break; + default: + ERR("unknown orient %d", orient); + evas_object_del(tmp); + evas_object_image_data_set(sd->obj, data); // give it back + return; } from = data2; for (x = iw; --x >= 0;)