summaryrefslogtreecommitdiff
path: root/src/lib/ecore_con
diff options
context:
space:
mode:
authorCedric BAIL <cedric@osg.samsung.com>2018-11-21 17:33:10 -0800
committerCedric BAIL <cedric@osg.samsung.com>2018-11-23 11:39:43 -0800
commit5de51f84fb206a728c5df72739ec187b69e7cc57 (patch)
tree14c8ea12a47f71411cbc5d2a5023f77b7a40c85a /src/lib/ecore_con
parentda01f169d0719a47d420ebe083b18b6b89798891 (diff)
eo: rename efl_future_Eina_FutureXXX_then in efl_future_then as this has been available for some time.
Reviewed-by: Vitor Sousa da Silva <vitorsousa@expertisesolutions.com.br> Differential Revision: https://phab.enlightenment.org/D7327
Diffstat (limited to 'src/lib/ecore_con')
-rw-r--r--src/lib/ecore_con/efl_net_control_access_point-connman.c4
-rw-r--r--src/lib/ecore_con/efl_net_control_technology-connman.c4
-rw-r--r--src/lib/ecore_con/efl_net_dialer_http.c2
-rw-r--r--src/lib/ecore_con/efl_net_dialer_ssl.c2
-rw-r--r--src/lib/ecore_con/efl_net_dialer_tcp.c2
-rw-r--r--src/lib/ecore_con/efl_net_dialer_udp.c2
-rw-r--r--src/lib/ecore_con/efl_net_dialer_unix.c2
-rw-r--r--src/lib/ecore_con/efl_net_dialer_websocket.c4
-rw-r--r--src/lib/ecore_con/efl_net_server_windows.c2
9 files changed, 12 insertions, 12 deletions
diff --git a/src/lib/ecore_con/efl_net_control_access_point-connman.c b/src/lib/ecore_con/efl_net_control_access_point-connman.c
index 92c491d..4dc6768 100644
--- a/src/lib/ecore_con/efl_net_control_access_point-connman.c
+++ b/src/lib/ecore_con/efl_net_control_access_point-connman.c
@@ -786,11 +786,11 @@ _efl_net_control_access_point_connect(Eo *o, Efl_Net_Control_Access_Point_Data *
786 pd->pending = eina_list_append(pd->pending, p); 786 pd->pending = eina_list_append(pd->pending, p);
787 eldbus_pending_data_set(p, ".object", pd); 787 eldbus_pending_data_set(p, ".object", pd);
788 788
789 return efl_future_Eina_FutureXXX_then(o, f); 789 return efl_future_then(o, f);
790 790
791 error_dbus: 791 error_dbus:
792 eina_promise_reject(promise, ENOSYS); 792 eina_promise_reject(promise, ENOSYS);
793 return efl_future_Eina_FutureXXX_then(o, f); 793 return efl_future_then(o, f);
794} 794}
795 795
796static void 796static void
diff --git a/src/lib/ecore_con/efl_net_control_technology-connman.c b/src/lib/ecore_con/efl_net_control_technology-connman.c
index 5dfb51f..2389498 100644
--- a/src/lib/ecore_con/efl_net_control_technology-connman.c
+++ b/src/lib/ecore_con/efl_net_control_technology-connman.c
@@ -413,11 +413,11 @@ _efl_net_control_technology_scan(Eo *o, Efl_Net_Control_Technology_Data *pd)
413 eina_promise_data_set(promise, p); 413 eina_promise_data_set(promise, p);
414 eldbus_pending_data_set(p, ".object", o); 414 eldbus_pending_data_set(p, ".object", o);
415 415
416 return efl_future_Eina_FutureXXX_then(o, f); 416 return efl_future_then(o, f);
417 417
418 error_dbus: 418 error_dbus:
419 eina_promise_reject(promise, ENOSYS); 419 eina_promise_reject(promise, ENOSYS);
420 return efl_future_Eina_FutureXXX_then(o, f); 420 return efl_future_then(o, f);
421} 421}
422 422
423const char * 423const char *
diff --git a/src/lib/ecore_con/efl_net_dialer_http.c b/src/lib/ecore_con/efl_net_dialer_http.c
index f1f18a0..bc004ba 100644
--- a/src/lib/ecore_con/efl_net_dialer_http.c
+++ b/src/lib/ecore_con/efl_net_dialer_http.c
@@ -1732,7 +1732,7 @@ _efl_net_dialer_http_efl_io_closer_close(Eo *o, Efl_Net_Dialer_Http_Data *pd)
1732 { 1732 {
1733 if ((!pd->pending_close) && (pd->easy)) 1733 if ((!pd->pending_close) && (pd->easy))
1734 { 1734 {
1735 efl_future_Eina_FutureXXX_then(o, efl_loop_job(efl_loop_get(o)), 1735 efl_future_then(o, efl_loop_job(efl_loop_get(o)),
1736 .success = _efl_net_dialer_http_pending_close, 1736 .success = _efl_net_dialer_http_pending_close,
1737 .storage = &pd->pending_close); 1737 .storage = &pd->pending_close);
1738 DBG("dialer=%p closed from CURL callback, schedule close job=%p", o, pd->pending_close); 1738 DBG("dialer=%p closed from CURL callback, schedule close job=%p", o, pd->pending_close);
diff --git a/src/lib/ecore_con/efl_net_dialer_ssl.c b/src/lib/ecore_con/efl_net_dialer_ssl.c
index 58189ee..d3e83f6 100644
--- a/src/lib/ecore_con/efl_net_dialer_ssl.c
+++ b/src/lib/ecore_con/efl_net_dialer_ssl.c
@@ -142,7 +142,7 @@ _efl_net_dialer_ssl_connect_timeout(Eo *o, const Eina_Value v)
142static void 142static void
143_timeout_schedule(Eo *o, Efl_Net_Dialer_Ssl_Data *pd, double timeout) 143_timeout_schedule(Eo *o, Efl_Net_Dialer_Ssl_Data *pd, double timeout)
144{ 144{
145 efl_future_Eina_FutureXXX_then(o, efl_loop_timeout(efl_loop_get(o), timeout), 145 efl_future_then(o, efl_loop_timeout(efl_loop_get(o), timeout),
146 .success = _efl_net_dialer_ssl_connect_timeout, 146 .success = _efl_net_dialer_ssl_connect_timeout,
147 .storage = &pd->connect_timeout); 147 .storage = &pd->connect_timeout);
148} 148}
diff --git a/src/lib/ecore_con/efl_net_dialer_tcp.c b/src/lib/ecore_con/efl_net_dialer_tcp.c
index 12e24b7..6b29831 100644
--- a/src/lib/ecore_con/efl_net_dialer_tcp.c
+++ b/src/lib/ecore_con/efl_net_dialer_tcp.c
@@ -103,7 +103,7 @@ _efl_net_dialer_tcp_connect_timeout(Eo *o, const Eina_Value v)
103static void 103static void
104_timeout_schedule(Eo *o, Efl_Net_Dialer_Tcp_Data *pd) 104_timeout_schedule(Eo *o, Efl_Net_Dialer_Tcp_Data *pd)
105{ 105{
106 efl_future_Eina_FutureXXX_then(o, efl_loop_timeout(efl_loop_get(o), pd->timeout_dial), 106 efl_future_then(o, efl_loop_timeout(efl_loop_get(o), pd->timeout_dial),
107 .success = _efl_net_dialer_tcp_connect_timeout, 107 .success = _efl_net_dialer_tcp_connect_timeout,
108 .storage = &pd->connect.timeout); 108 .storage = &pd->connect.timeout);
109} 109}
diff --git a/src/lib/ecore_con/efl_net_dialer_udp.c b/src/lib/ecore_con/efl_net_dialer_udp.c
index 89a7154..f3e7ef2 100644
--- a/src/lib/ecore_con/efl_net_dialer_udp.c
+++ b/src/lib/ecore_con/efl_net_dialer_udp.c
@@ -103,7 +103,7 @@ _efl_net_dialer_udp_resolver_timeout(Eo *o, const Eina_Value v)
103static void 103static void
104_timeout_schedule(Eo *o, Efl_Net_Dialer_Udp_Data *pd) 104_timeout_schedule(Eo *o, Efl_Net_Dialer_Udp_Data *pd)
105{ 105{
106 efl_future_Eina_FutureXXX_then(o, efl_loop_timeout(efl_loop_get(o), pd->timeout_dial), 106 efl_future_then(o, efl_loop_timeout(efl_loop_get(o), pd->timeout_dial),
107 .success = _efl_net_dialer_udp_resolver_timeout, 107 .success = _efl_net_dialer_udp_resolver_timeout,
108 .storage = &pd->resolver.timeout); 108 .storage = &pd->resolver.timeout);
109} 109}
diff --git a/src/lib/ecore_con/efl_net_dialer_unix.c b/src/lib/ecore_con/efl_net_dialer_unix.c
index 683a37b..d644d5d 100644
--- a/src/lib/ecore_con/efl_net_dialer_unix.c
+++ b/src/lib/ecore_con/efl_net_dialer_unix.c
@@ -129,7 +129,7 @@ _efl_net_dialer_unix_connected(void *data, const struct sockaddr *addr, socklen_
129static void 129static void
130_timeout_schedule(Eo *o, Efl_Net_Dialer_Unix_Data *pd) 130_timeout_schedule(Eo *o, Efl_Net_Dialer_Unix_Data *pd)
131{ 131{
132 efl_future_Eina_FutureXXX_then(o, efl_loop_timeout(efl_loop_get(o), pd->timeout_dial), 132 efl_future_then(o, efl_loop_timeout(efl_loop_get(o), pd->timeout_dial),
133 .success = _efl_net_dialer_unix_connect_timeout, 133 .success = _efl_net_dialer_unix_connect_timeout,
134 .storage = &pd->connect.timeout); 134 .storage = &pd->connect.timeout);
135} 135}
diff --git a/src/lib/ecore_con/efl_net_dialer_websocket.c b/src/lib/ecore_con/efl_net_dialer_websocket.c
index 80c598a..3c5339d 100644
--- a/src/lib/ecore_con/efl_net_dialer_websocket.c
+++ b/src/lib/ecore_con/efl_net_dialer_websocket.c
@@ -764,7 +764,7 @@ _efl_net_dialer_websocket_job_schedule(Eo *o, Efl_Net_Dialer_Websocket_Data *pd)
764 loop = efl_loop_get(o); 764 loop = efl_loop_get(o);
765 if (!loop) return; 765 if (!loop) return;
766 766
767 efl_future_Eina_FutureXXX_then(o, efl_loop_job(loop), 767 efl_future_then(o, efl_loop_job(loop),
768 .success = _efl_net_dialer_websocket_job, 768 .success = _efl_net_dialer_websocket_job,
769 .storage = &pd->job); 769 .storage = &pd->job);
770} 770}
@@ -1504,7 +1504,7 @@ _efl_net_dialer_websocket_close_request(Eo *o, Efl_Net_Dialer_Websocket_Data *pd
1504 if (pd->close_timeout) 1504 if (pd->close_timeout)
1505 eina_future_cancel(pd->close_timeout); 1505 eina_future_cancel(pd->close_timeout);
1506 1506
1507 efl_future_Eina_FutureXXX_then(o, efl_loop_timeout(efl_loop_get(o), 2.0), 1507 efl_future_then(o, efl_loop_timeout(efl_loop_get(o), 2.0),
1508 .success = _efl_net_dialer_websocket_close_request_timeout, 1508 .success = _efl_net_dialer_websocket_close_request_timeout,
1509 .storage = &pd->close_timeout); 1509 .storage = &pd->close_timeout);
1510 1510
diff --git a/src/lib/ecore_con/efl_net_server_windows.c b/src/lib/ecore_con/efl_net_server_windows.c
index 1e0375e..8859036 100644
--- a/src/lib/ecore_con/efl_net_server_windows.c
+++ b/src/lib/ecore_con/efl_net_server_windows.c
@@ -338,7 +338,7 @@ _efl_net_server_windows_pending_announce_job_schedule(Eo *o, Efl_Net_Server_Wind
338 338
339 loop = efl_loop_get(o); 339 loop = efl_loop_get(o);
340 if (!loop) return; 340 if (!loop) return;
341 efl_future_Eina_FutureXXX_then(o, efl_loop_job(loop), 341 efl_future_then(o, efl_loop_job(loop),
342 .success = _efl_net_server_windows_pending_announce_job, 342 .success = _efl_net_server_windows_pending_announce_job,
343 .storage = &pd->pending_announcer_job); 343 .storage = &pd->pending_announcer_job);
344} 344}