summaryrefslogtreecommitdiff
path: root/legacy/ecore
diff options
context:
space:
mode:
authortsauerbeck <tsauerbeck>2004-05-09 07:55:40 +0000
committertsauerbeck <tsauerbeck@7cbeb6ba-43b4-40fd-8cce-4c39aea84d33>2004-05-09 07:55:40 +0000
commitb8edd19b2d5b7455891159386a61062f35656e21 (patch)
treea29c97137568b21914afd5c883a8e0846b912cdf /legacy/ecore
parent110fd6f3998d02eb6b31e02b0facb9f304be4d5f (diff)
don't use our own event_free callback when the default is good enough
SVN revision: 10140
Diffstat (limited to 'legacy/ecore')
-rw-r--r--legacy/ecore/src/lib/ecore_con/ecore_con.c58
1 files changed, 6 insertions, 52 deletions
diff --git a/legacy/ecore/src/lib/ecore_con/ecore_con.c b/legacy/ecore/src/lib/ecore_con/ecore_con.c
index 0e56761919..82edbad461 100644
--- a/legacy/ecore/src/lib/ecore_con/ecore_con.c
+++ b/legacy/ecore/src/lib/ecore_con/ecore_con.c
@@ -32,10 +32,6 @@ static int _ecore_con_cl_handler(void *data, Ecore_Fd_Handler *fd_handler);
32static int _ecore_con_svr_cl_handler(void *data, Ecore_Fd_Handler *fd_handler); 32static int _ecore_con_svr_cl_handler(void *data, Ecore_Fd_Handler *fd_handler);
33static void _ecore_con_server_flush(Ecore_Con_Server *svr); 33static void _ecore_con_server_flush(Ecore_Con_Server *svr);
34static void _ecore_con_client_flush(Ecore_Con_Client *cl); 34static void _ecore_con_client_flush(Ecore_Con_Client *cl);
35static void _ecore_con_event_client_add_free(void *data, void *ev);
36static void _ecore_con_event_client_del_free(void *data, void *ev);
37static void _ecore_con_event_server_add_free(void *data, void *ev);
38static void _ecore_con_event_server_del_free(void *data, void *ev);
39static void _ecore_con_event_client_data_free(void *data, void *ev); 35static void _ecore_con_event_client_data_free(void *data, void *ev);
40static void _ecore_con_event_server_data_free(void *data, void *ev); 36static void _ecore_con_event_server_data_free(void *data, void *ev);
41 37
@@ -365,8 +361,7 @@ ecore_con_server_connect(Ecore_Con_Type compl_type,
365 if (e) 361 if (e)
366 { 362 {
367 e->server = svr; 363 e->server = svr;
368 ecore_event_add(ECORE_CON_EVENT_SERVER_ADD, e, 364 ecore_event_add(ECORE_CON_EVENT_SERVER_ADD, e, NULL, NULL);
369 _ecore_con_event_server_add_free, NULL);
370 } 365 }
371 } 366 }
372 } 367 }
@@ -722,8 +717,7 @@ _ecore_con_svr_handler(void *data, Ecore_Fd_Handler *fd_handler)
722 if (e) 717 if (e)
723 { 718 {
724 e->client = cl; 719 e->client = cl;
725 ecore_event_add(ECORE_CON_EVENT_CLIENT_ADD, e, 720 ecore_event_add(ECORE_CON_EVENT_CLIENT_ADD, e, NULL, NULL);
726 _ecore_con_event_client_add_free, NULL);
727 } 721 }
728 } 722 }
729 } 723 }
@@ -762,8 +756,7 @@ kill_server(Ecore_Con_Server *svr)
762 if (e) 756 if (e)
763 { 757 {
764 e->server = svr; 758 e->server = svr;
765 ecore_event_add(ECORE_CON_EVENT_SERVER_DEL, e, 759 ecore_event_add(ECORE_CON_EVENT_SERVER_DEL, e, NULL, NULL);
766 _ecore_con_event_server_del_free, NULL);
767 } 760 }
768 761
769 svr->dead = 1; 762 svr->dead = 1;
@@ -794,8 +787,7 @@ svr_try_connect(Ecore_Con_Server *svr)
794 if (e) 787 if (e)
795 { 788 {
796 e->server = svr; 789 e->server = svr;
797 ecore_event_add(ECORE_CON_EVENT_SERVER_ADD, e, 790 ecore_event_add(ECORE_CON_EVENT_SERVER_ADD, e, NULL, NULL);
798 _ecore_con_event_server_add_free, NULL);
799 } 791 }
800 if (!svr->write_buf) 792 if (!svr->write_buf)
801 ecore_main_fd_handler_active_set(svr->fd_handler, ECORE_FD_READ); 793 ecore_main_fd_handler_active_set(svr->fd_handler, ECORE_FD_READ);
@@ -978,8 +970,7 @@ _ecore_con_svr_cl_handler(void *data, Ecore_Fd_Handler *fd_handler)
978 if (e) 970 if (e)
979 { 971 {
980 e->client = cl; 972 e->client = cl;
981 ecore_event_add(ECORE_CON_EVENT_CLIENT_DEL, e, 973 ecore_event_add(ECORE_CON_EVENT_CLIENT_DEL, e, NULL, NULL);
982 _ecore_con_event_client_del_free, NULL);
983 } 974 }
984 cl->dead = 1; 975 cl->dead = 1;
985 ecore_main_fd_handler_del(cl->fd_handler); 976 ecore_main_fd_handler_del(cl->fd_handler);
@@ -1092,8 +1083,7 @@ _ecore_con_client_flush(Ecore_Con_Client *cl)
1092 if (e) 1083 if (e)
1093 { 1084 {
1094 e->client = cl; 1085 e->client = cl;
1095 ecore_event_add(ECORE_CON_EVENT_CLIENT_DEL, e, 1086 ecore_event_add(ECORE_CON_EVENT_CLIENT_DEL, e, NULL, NULL);
1096 _ecore_con_event_client_del_free, NULL);
1097 } 1087 }
1098 cl->dead = 1; 1088 cl->dead = 1;
1099 ecore_main_fd_handler_del(cl->fd_handler); 1089 ecore_main_fd_handler_del(cl->fd_handler);
@@ -1113,42 +1103,6 @@ _ecore_con_client_flush(Ecore_Con_Client *cl)
1113} 1103}
1114 1104
1115static void 1105static void
1116_ecore_con_event_client_add_free(void *data, void *ev)
1117{
1118 Ecore_Con_Event_Client_Add *e;
1119
1120 e = ev;
1121 free(e);
1122}
1123
1124static void
1125_ecore_con_event_client_del_free(void *data, void *ev)
1126{
1127 Ecore_Con_Event_Client_Del *e;
1128
1129 e = ev;
1130 free(e);
1131}
1132
1133static void
1134_ecore_con_event_server_add_free(void *data, void *ev)
1135{
1136 Ecore_Con_Event_Server_Add *e;
1137
1138 e = ev;
1139 free(e);
1140}
1141
1142static void
1143_ecore_con_event_server_del_free(void *data, void *ev)
1144{
1145 Ecore_Con_Event_Server_Del *e;
1146
1147 e = ev;
1148 free(e);
1149}
1150
1151static void
1152_ecore_con_event_client_data_free(void *data, void *ev) 1106_ecore_con_event_client_data_free(void *data, void *ev)
1153{ 1107{
1154 Ecore_Con_Event_Client_Data *e; 1108 Ecore_Con_Event_Client_Data *e;