diff options
author | michelle legrand <michelle.legrand@openwide.fr> | 2015-02-04 12:01:36 +0100 |
---|---|---|
committer | Cedric BAIL <cedric@osg.samsung.com> | 2015-02-11 17:03:37 +0100 |
commit | fbb82367004db0fb095901ab450f029a7af6dede (patch) | |
tree | ba71c4c1ec06c915df1506a22e7309f4ff7346a9 /src | |
parent | a9035c1cf5852be7bdd36edaa9dc3bfd64c44dd0 (diff) |
ecore: directly allocating and freeing Ecore_Win32_Handler variable.
There was no memory pool nor any function like that in fact.
@fix
Diffstat (limited to 'src')
-rw-r--r-- | src/lib/ecore/ecore_main.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/ecore/ecore_main.c b/src/lib/ecore/ecore_main.c index de84e61a7f..98e56ff2f7 100644 --- a/src/lib/ecore/ecore_main.c +++ b/src/lib/ecore/ecore_main.c | |||
@@ -1150,7 +1150,7 @@ ecore_main_win32_handler_add(void *h, | |||
1150 | EINA_MAIN_LOOP_CHECK_RETURN_VAL(NULL); | 1150 | EINA_MAIN_LOOP_CHECK_RETURN_VAL(NULL); |
1151 | if (!h || !func) return NULL; | 1151 | if (!h || !func) return NULL; |
1152 | 1152 | ||
1153 | wh = ecore_win32_handler_calloc(1); | 1153 | wh = calloc(1, sizeof(Ecore_Win32_Handler)); |
1154 | if (!wh) return NULL; | 1154 | if (!wh) return NULL; |
1155 | ECORE_MAGIC_SET(wh, ECORE_MAGIC_WIN32_HANDLER); | 1155 | ECORE_MAGIC_SET(wh, ECORE_MAGIC_WIN32_HANDLER); |
1156 | wh->h = (HANDLE)h; | 1156 | wh->h = (HANDLE)h; |
@@ -1356,7 +1356,7 @@ _ecore_main_shutdown(void) | |||
1356 | win32_handlers = (Ecore_Win32_Handler *)eina_inlist_remove(EINA_INLIST_GET(win32_handlers), | 1356 | win32_handlers = (Ecore_Win32_Handler *)eina_inlist_remove(EINA_INLIST_GET(win32_handlers), |
1357 | EINA_INLIST_GET(wh)); | 1357 | EINA_INLIST_GET(wh)); |
1358 | ECORE_MAGIC_SET(wh, ECORE_MAGIC_NONE); | 1358 | ECORE_MAGIC_SET(wh, ECORE_MAGIC_NONE); |
1359 | ecore_win32_handler_mp_free(wh); | 1359 | free(wh); |
1360 | } | 1360 | } |
1361 | win32_handlers_delete_me = EINA_FALSE; | 1361 | win32_handlers_delete_me = EINA_FALSE; |
1362 | win32_handler_current = NULL; | 1362 | win32_handler_current = NULL; |
@@ -1659,7 +1659,7 @@ _ecore_main_win32_handlers_cleanup(void) | |||
1659 | eina_inlist_remove(EINA_INLIST_GET(win32_handlers), | 1659 | eina_inlist_remove(EINA_INLIST_GET(win32_handlers), |
1660 | EINA_INLIST_GET(wh)); | 1660 | EINA_INLIST_GET(wh)); |
1661 | ECORE_MAGIC_SET(wh, ECORE_MAGIC_NONE); | 1661 | ECORE_MAGIC_SET(wh, ECORE_MAGIC_NONE); |
1662 | ecore_win32_handler_mp_free(wh); | 1662 | free(wh); |
1663 | } | 1663 | } |
1664 | } | 1664 | } |
1665 | if (!deleted_in_use) win32_handlers_delete_me = EINA_FALSE; | 1665 | if (!deleted_in_use) win32_handlers_delete_me = EINA_FALSE; |