summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2016-10-03 11:55:55 +0900
committerMike Blumenkrantz <zmike@osg.samsung.com>2016-10-04 09:37:17 -0400
commit8e16b5bcfcb6b9fb53b62e24297829a6412bd0f0 (patch)
treed7ed9125ad3028975e8268f8c9ffcd48e79d7e7e
parenta2e870870db3a2a216770e78f29341265199fefd (diff)
explicitly use eina list types passing into EINA_LIST_FREE()
-rw-r--r--src/bin/e_dnd.c4
-rw-r--r--src/bin/e_fm_device.c4
-rw-r--r--src/bin/e_gadget.c3
-rw-r--r--src/bin/e_pixmap.c3
4 files changed, 10 insertions, 4 deletions
diff --git a/src/bin/e_dnd.c b/src/bin/e_dnd.c
index 5e799f2cb..20ed64bf9 100644
--- a/src/bin/e_dnd.c
+++ b/src/bin/e_dnd.c
@@ -1051,6 +1051,7 @@ _e_drag_end(int x, int y)
1051 ((h->cb.drop) && (E_INSIDE(ev.x, ev.y, h->x, h->y, h->w, h->h)))) 1051 ((h->cb.drop) && (E_INSIDE(ev.x, ev.y, h->x, h->y, h->w, h->h))))
1052 { 1052 {
1053 Eina_Bool need_free = EINA_FALSE; 1053 Eina_Bool need_free = EINA_FALSE;
1054 Eina_List *list;
1054 1055
1055 if (_drag_current->cb.convert) 1056 if (_drag_current->cb.convert)
1056 { 1057 {
@@ -1084,7 +1085,8 @@ _e_drag_end(int x, int y)
1084 ev.data = _drag_current->data; 1085 ev.data = _drag_current->data;
1085 } 1086 }
1086 h->cb.drop(h->cb.data, h->active_type, &ev); 1087 h->cb.drop(h->cb.data, h->active_type, &ev);
1087 if (need_free) E_FREE_LIST(ev.data, free); 1088 list = ev.data;
1089 if (need_free) E_FREE_LIST(list, free);
1088 dropped = 1; 1090 dropped = 1;
1089 } 1091 }
1090 h->entered = 0; 1092 h->entered = 0;
diff --git a/src/bin/e_fm_device.c b/src/bin/e_fm_device.c
index a7a252e0a..ed9d1b656 100644
--- a/src/bin/e_fm_device.c
+++ b/src/bin/e_fm_device.c
@@ -683,9 +683,11 @@ _e_fm2_device_check_desktop_icons_list_cb(const char *name, const char *path, vo
683static void 683static void
684_e_fm2_device_check_desktop_icons_cb(void *data, Ecore_Thread *eth EINA_UNUSED) 684_e_fm2_device_check_desktop_icons_cb(void *data, Ecore_Thread *eth EINA_UNUSED)
685{ 685{
686 Eina_List *list = data;
687
686 eina_file_dir_list(efreet_desktop_dir_get(), EINA_FALSE, _e_fm2_device_check_desktop_icons_list_cb, data); 688 eina_file_dir_list(efreet_desktop_dir_get(), EINA_FALSE, _e_fm2_device_check_desktop_icons_list_cb, data);
687 689
688 E_FREE_LIST(data, free); 690 E_FREE_LIST(list, free);
689} 691}
690 692
691E_API void 693E_API void
diff --git a/src/bin/e_gadget.c b/src/bin/e_gadget.c
index 9ea924b10..eccf157bd 100644
--- a/src/bin/e_gadget.c
+++ b/src/bin/e_gadget.c
@@ -1689,7 +1689,8 @@ e_gadget_shutdown(void)
1689static void 1689static void
1690_editor_del(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) 1690_editor_del(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
1691{ 1691{
1692 E_FREE_LIST(data, free); 1692 Eina_List *list = data;
1693 E_FREE_LIST(list, free);
1693} 1694}
1694 1695
1695static void 1696static void
diff --git a/src/bin/e_pixmap.c b/src/bin/e_pixmap.c
index 72b26e88d..4d2881407 100644
--- a/src/bin/e_pixmap.c
+++ b/src/bin/e_pixmap.c
@@ -127,7 +127,8 @@ _e_pixmap_clear(E_Pixmap *cp, Eina_Bool cache)
127static void 127static void
128_e_pixmap_image_clear_x(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) 128_e_pixmap_image_clear_x(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
129{ 129{
130 E_FREE_LIST(data, ecore_x_image_free); 130 Eina_List *list = data;
131 E_FREE_LIST(list, ecore_x_image_free);
131} 132}
132#endif 133#endif
133 134