From 5a205670c8a6b8dc1af56312a11cae701bb08c95 Mon Sep 17 00:00:00 2001 From: englebass Date: Wed, 18 Jan 2012 23:33:07 +0000 Subject: [PATCH] evas: Fix shadow warnings git-svn-id: http://svn.enlightenment.org/svn/e/trunk/evas@67300 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- src/lib/canvas/evas_events.c | 1 - src/lib/canvas/evas_object_smart.c | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/lib/canvas/evas_events.c b/src/lib/canvas/evas_events.c index 73a18e1..9b7077e 100644 --- a/src/lib/canvas/evas_events.c +++ b/src/lib/canvas/evas_events.c @@ -376,7 +376,6 @@ _post_up_handle(Evas *e, unsigned int timestamp, const void *data) { Evas_Event_Mouse_In ev_in; Evas_Object *obj_itr; - int event_id = 0; _evas_object_event_new(); diff --git a/src/lib/canvas/evas_object_smart.c b/src/lib/canvas/evas_object_smart.c index cca7201..69d7f3b 100644 --- a/src/lib/canvas/evas_object_smart.c +++ b/src/lib/canvas/evas_object_smart.c @@ -421,13 +421,13 @@ evas_object_smart_callback_del_full(Evas_Object *obj, const char *event, Evas_Sm { if ((!strcmp(cb->event, event)) && (cb->func == func) && (cb->func_data == data)) { - void *data; + void *ret; - data = cb->func_data; + ret = cb->func_data; cb->delete_me = 1; o->deletions_waiting = 1; evas_object_smart_callbacks_clear(obj); - return data; + return ret; } } return NULL; -- 2.7.4