From 25ea899dfae39b155f7f0f2b7cafc456cfd1f1d8 Mon Sep 17 00:00:00 2001 From: Daniel Zaoui Date: Wed, 5 Dec 2012 06:25:49 +0000 Subject: [PATCH] Some KlocWork fixes. Signed-off-by: Daniel Zaoui SVN revision: 80211 --- src/lib/evas/canvas/evas_events.c | 4 ++-- src/lib/evas/canvas/evas_object_textblock.c | 7 ++++--- src/lib/evas/canvas/evas_smart.c | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/lib/evas/canvas/evas_events.c b/src/lib/evas/canvas/evas_events.c index ba643b7045..587071e9f3 100644 --- a/src/lib/evas/canvas/evas_events.c +++ b/src/lib/evas/canvas/evas_events.c @@ -53,7 +53,7 @@ _evas_event_object_list_raw_in_get(Evas *eo_e, Eina_List *in, int x, int y, int *no_rep, Eina_Bool source) { Evas_Object *eo_obj; - Evas_Object_Protected_Data *obj; + Evas_Object_Protected_Data *obj = NULL; int inside; if (!list) return in; @@ -626,6 +626,7 @@ _evas_event_source_multi_up_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event_M EINA_LIST_FOREACH(copy, l, eo_child) { ev->canvas = point; + child = eo_data_get(eo_child, EVAS_OBJ_CLASS); if ((child->pointer_mode != EVAS_OBJECT_POINTER_MODE_NOGRAB) && (child->mouse_grabbed > 0)) { @@ -639,7 +640,6 @@ _evas_event_source_multi_up_events(Evas_Object *eo_obj, Evas *eo_e, Evas_Event_M &ev->canvas.x, &ev->canvas.y, child->mouse_grabbed); - child = eo_data_get(eo_child, EVAS_OBJ_CLASS); evas_object_event_callback_call(eo_child, child, EVAS_CALLBACK_MULTI_UP, ev, event_id); if (e->delete_me || e->is_frozen) break; diff --git a/src/lib/evas/canvas/evas_object_textblock.c b/src/lib/evas/canvas/evas_object_textblock.c index ad03a52c58..7079d27f16 100644 --- a/src/lib/evas/canvas/evas_object_textblock.c +++ b/src/lib/evas/canvas/evas_object_textblock.c @@ -7953,11 +7953,12 @@ _evas_textblock_cursor_range_text_markup_get(const Evas_Textblock_Cursor *cur1, Evas_Object_Textblock_Node_Text *tnode; Eina_Strbuf *buf; Evas_Textblock_Cursor *cur2; - buf = eina_strbuf_new(); if (!cur1 || !cur1->node) return NULL; if (!_cur2 || !_cur2->node) return NULL; if (cur1->obj != _cur2->obj) return NULL; + buf = eina_strbuf_new(); + if (evas_textblock_cursor_compare(cur1, _cur2) > 0) { const Evas_Textblock_Cursor *tc; @@ -8072,11 +8073,11 @@ _evas_textblock_cursor_range_text_plain_get(const Evas_Textblock_Cursor *cur1, c Evas_Object_Textblock_Node_Text *n1, *n2; Evas_Textblock_Cursor *cur2; - buf = eina_ustrbuf_new(); - if (!cur1 || !cur1->node) return NULL; if (!_cur2 || !_cur2->node) return NULL; if (cur1->obj != _cur2->obj) return NULL; + buf = eina_ustrbuf_new(); + if (evas_textblock_cursor_compare(cur1, _cur2) > 0) { const Evas_Textblock_Cursor *tc; diff --git a/src/lib/evas/canvas/evas_smart.c b/src/lib/evas/canvas/evas_smart.c index f39721dd07..87856b7674 100644 --- a/src/lib/evas/canvas/evas_smart.c +++ b/src/lib/evas/canvas/evas_smart.c @@ -255,7 +255,7 @@ _evas_smart_class_callbacks_create(Evas_Smart *s) static void _evas_smart_class_interfaces_create(Evas_Smart *s) { - unsigned int i, total_priv_sz; + unsigned int i, total_priv_sz = 0; const Evas_Smart_Class *sc; /* get number of interfaces on the smart */