summaryrefslogtreecommitdiff
path: root/src/examples/ecore
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@samsung.com>2019-03-08 10:47:32 -0500
committerCedric BAIL <cedric.bail@free.fr>2019-03-08 12:17:51 -0800
commit36661a436edffa53dd1faf5d25df1a8ea8c00261 (patch)
tree9a2f7e511921e5871c96f32bc1d8b02341f7d2cd /src/examples/ecore
parent1d1effea906dc4f784625af7dfba2518ef1e90b7 (diff)
efl-net: namespace events to avoid naming conflicts
Reviewed-by: Cedric BAIL <cedric.bail@free.fr> Differential Revision: https://phab.enlightenment.org/D8260
Diffstat (limited to 'src/examples/ecore')
-rw-r--r--src/examples/ecore/efl_io_buffered_stream_example.c2
-rw-r--r--src/examples/ecore/efl_io_copier_example.c6
-rw-r--r--src/examples/ecore/efl_io_queue_example.c2
-rw-r--r--src/examples/ecore/efl_net_dialer_http_example.c6
-rw-r--r--src/examples/ecore/efl_net_dialer_simple_example.c4
-rw-r--r--src/examples/ecore/efl_net_dialer_udp_example.c6
-rw-r--r--src/examples/ecore/efl_net_dialer_unix_example.c6
-rw-r--r--src/examples/ecore/efl_net_dialer_websocket_autobahntestee.c4
-rw-r--r--src/examples/ecore/efl_net_dialer_websocket_example.c6
-rw-r--r--src/examples/ecore/efl_net_dialer_windows_example.c6
-rw-r--r--src/examples/ecore/efl_net_server_example.c2
-rw-r--r--src/examples/ecore/efl_net_server_simple_example.c2
-rw-r--r--src/examples/ecore/efl_net_socket_ssl_dialer_example.c6
-rw-r--r--src/examples/ecore/efl_net_socket_ssl_server_example.c2
14 files changed, 30 insertions, 30 deletions
diff --git a/src/examples/ecore/efl_io_buffered_stream_example.c b/src/examples/ecore/efl_io_buffered_stream_example.c
index c7fe102890..1f816c7072 100644
--- a/src/examples/ecore/efl_io_buffered_stream_example.c
+++ b/src/examples/ecore/efl_io_buffered_stream_example.c
@@ -236,7 +236,7 @@ efl_main(void *data EINA_UNUSED,
236 /* The TCP client to use to send/receive network data */ 236 /* The TCP client to use to send/receive network data */
237 dialer = efl_add(EFL_NET_DIALER_TCP_CLASS, ev->object, 237 dialer = efl_add(EFL_NET_DIALER_TCP_CLASS, ev->object,
238 efl_name_set(efl_added, "dialer"), 238 efl_name_set(efl_added, "dialer"),
239 efl_event_callback_add(efl_added, EFL_NET_DIALER_EVENT_CONNECTED, _dialer_connected, NULL)); 239 efl_event_callback_add(efl_added, EFL_NET_DIALER_EVENT_DIALER_CONNECTED, _dialer_connected, NULL));
240 if (!dialer) 240 if (!dialer)
241 { 241 {
242 fprintf(stderr, "ERROR: could not create Efl_Net_Dialer_Tcp\n"); 242 fprintf(stderr, "ERROR: could not create Efl_Net_Dialer_Tcp\n");
diff --git a/src/examples/ecore/efl_io_copier_example.c b/src/examples/ecore/efl_io_copier_example.c
index 13f26b8577..d4e36b7070 100644
--- a/src/examples/ecore/efl_io_copier_example.c
+++ b/src/examples/ecore/efl_io_copier_example.c
@@ -77,9 +77,9 @@ _dialer_connected(void *data EINA_UNUSED, const Efl_Event *event)
77} 77}
78 78
79EFL_CALLBACKS_ARRAY_DEFINE(dialer_cbs, 79EFL_CALLBACKS_ARRAY_DEFINE(dialer_cbs,
80 { EFL_NET_DIALER_EVENT_RESOLVED, _dialer_resolved }, 80 { EFL_NET_DIALER_EVENT_DIALER_RESOLVED, _dialer_resolved },
81 { EFL_NET_DIALER_EVENT_ERROR, _dialer_error }, 81 { EFL_NET_DIALER_EVENT_DIALER_ERROR, _dialer_error },
82 { EFL_NET_DIALER_EVENT_CONNECTED, _dialer_connected }); 82 { EFL_NET_DIALER_EVENT_DIALER_CONNECTED, _dialer_connected });
83 83
84static void 84static void
85_http_headers_done(void *data EINA_UNUSED, const Efl_Event *event) 85_http_headers_done(void *data EINA_UNUSED, const Efl_Event *event)
diff --git a/src/examples/ecore/efl_io_queue_example.c b/src/examples/ecore/efl_io_queue_example.c
index 62e6035450..7a22feb631 100644
--- a/src/examples/ecore/efl_io_queue_example.c
+++ b/src/examples/ecore/efl_io_queue_example.c
@@ -305,7 +305,7 @@ efl_main(void *data EINA_UNUSED,
305 /* The TCP client to use to send/receive network data */ 305 /* The TCP client to use to send/receive network data */
306 dialer = efl_add(EFL_NET_DIALER_TCP_CLASS, loop, 306 dialer = efl_add(EFL_NET_DIALER_TCP_CLASS, loop,
307 efl_name_set(efl_added, "dialer"), 307 efl_name_set(efl_added, "dialer"),
308 efl_event_callback_add(efl_added, EFL_NET_DIALER_EVENT_CONNECTED, _dialer_connected, NULL)); 308 efl_event_callback_add(efl_added, EFL_NET_DIALER_EVENT_DIALER_CONNECTED, _dialer_connected, NULL));
309 if (!dialer) 309 if (!dialer)
310 { 310 {
311 fprintf(stderr, "ERROR: could not create Efl_Net_Dialer_Tcp\n"); 311 fprintf(stderr, "ERROR: could not create Efl_Net_Dialer_Tcp\n");
diff --git a/src/examples/ecore/efl_net_dialer_http_example.c b/src/examples/ecore/efl_net_dialer_http_example.c
index 02783dc165..1289fb01ba 100644
--- a/src/examples/ecore/efl_net_dialer_http_example.c
+++ b/src/examples/ecore/efl_net_dialer_http_example.c
@@ -71,9 +71,9 @@ _http_headers_done(void *data EINA_UNUSED, const Efl_Event *event)
71 71
72EFL_CALLBACKS_ARRAY_DEFINE(dialer_cbs, 72EFL_CALLBACKS_ARRAY_DEFINE(dialer_cbs,
73 { EFL_NET_DIALER_HTTP_EVENT_HEADERS_DONE, _http_headers_done }, 73 { EFL_NET_DIALER_HTTP_EVENT_HEADERS_DONE, _http_headers_done },
74 { EFL_NET_DIALER_EVENT_CONNECTED, _connected }, 74 { EFL_NET_DIALER_EVENT_DIALER_CONNECTED, _connected },
75 { EFL_NET_DIALER_EVENT_RESOLVED, _resolved }, 75 { EFL_NET_DIALER_EVENT_DIALER_RESOLVED, _resolved },
76 { EFL_NET_DIALER_EVENT_ERROR, _error }, 76 { EFL_NET_DIALER_EVENT_DIALER_ERROR, _error },
77 { EFL_IO_CLOSER_EVENT_CLOSED, _closed }, 77 { EFL_IO_CLOSER_EVENT_CLOSED, _closed },
78 { EFL_IO_READER_EVENT_EOS, _eos }); 78 { EFL_IO_READER_EVENT_EOS, _eos });
79 79
diff --git a/src/examples/ecore/efl_net_dialer_simple_example.c b/src/examples/ecore/efl_net_dialer_simple_example.c
index 1285dae2f1..40243cc11f 100644
--- a/src/examples/ecore/efl_net_dialer_simple_example.c
+++ b/src/examples/ecore/efl_net_dialer_simple_example.c
@@ -176,8 +176,8 @@ _done(void *data EINA_UNUSED, const Efl_Event *event)
176} 176}
177 177
178EFL_CALLBACKS_ARRAY_DEFINE(dialer_cbs, 178EFL_CALLBACKS_ARRAY_DEFINE(dialer_cbs,
179 { EFL_NET_DIALER_EVENT_CONNECTED, _connected }, /* optional */ 179 { EFL_NET_DIALER_EVENT_DIALER_CONNECTED, _connected }, /* optional */
180 { EFL_NET_DIALER_EVENT_RESOLVED, _resolved }, /* optional */ 180 { EFL_NET_DIALER_EVENT_DIALER_RESOLVED, _resolved }, /* optional */
181 { EFL_IO_READER_EVENT_CAN_READ_CHANGED, _can_read }, /* optional, can be used to read data, here just for monitoring */ 181 { EFL_IO_READER_EVENT_CAN_READ_CHANGED, _can_read }, /* optional, can be used to read data, here just for monitoring */
182 { EFL_IO_READER_EVENT_EOS, _eos }, /* recommended, notifies no more incoming data */ 182 { EFL_IO_READER_EVENT_EOS, _eos }, /* recommended, notifies no more incoming data */
183 { EFL_IO_BUFFERED_STREAM_EVENT_LINE, _line }, /* optional, could use 'slice,changed' or 'can_read,changed' instead */ 183 { EFL_IO_BUFFERED_STREAM_EVENT_LINE, _line }, /* optional, could use 'slice,changed' or 'can_read,changed' instead */
diff --git a/src/examples/ecore/efl_net_dialer_udp_example.c b/src/examples/ecore/efl_net_dialer_udp_example.c
index bb01b58f8a..3fef035eef 100644
--- a/src/examples/ecore/efl_net_dialer_udp_example.c
+++ b/src/examples/ecore/efl_net_dialer_udp_example.c
@@ -156,9 +156,9 @@ _error(void *data EINA_UNUSED, const Efl_Event *event)
156} 156}
157 157
158EFL_CALLBACKS_ARRAY_DEFINE(dialer_cbs, 158EFL_CALLBACKS_ARRAY_DEFINE(dialer_cbs,
159 { EFL_NET_DIALER_EVENT_CONNECTED, _connected }, 159 { EFL_NET_DIALER_EVENT_DIALER_CONNECTED, _connected },
160 { EFL_NET_DIALER_EVENT_RESOLVED, _resolved }, 160 { EFL_NET_DIALER_EVENT_DIALER_RESOLVED, _resolved },
161 { EFL_NET_DIALER_EVENT_ERROR, _error }, 161 { EFL_NET_DIALER_EVENT_DIALER_ERROR, _error },
162 { EFL_IO_READER_EVENT_CAN_READ_CHANGED, _can_read }, 162 { EFL_IO_READER_EVENT_CAN_READ_CHANGED, _can_read },
163 { EFL_IO_WRITER_EVENT_CAN_WRITE_CHANGED, _can_write } 163 { EFL_IO_WRITER_EVENT_CAN_WRITE_CHANGED, _can_write }
164 ); 164 );
diff --git a/src/examples/ecore/efl_net_dialer_unix_example.c b/src/examples/ecore/efl_net_dialer_unix_example.c
index f0298aed4a..8cfb2213e1 100644
--- a/src/examples/ecore/efl_net_dialer_unix_example.c
+++ b/src/examples/ecore/efl_net_dialer_unix_example.c
@@ -108,9 +108,9 @@ _error(void *data EINA_UNUSED, const Efl_Event *event)
108} 108}
109 109
110EFL_CALLBACKS_ARRAY_DEFINE(dialer_cbs, 110EFL_CALLBACKS_ARRAY_DEFINE(dialer_cbs,
111 { EFL_NET_DIALER_EVENT_CONNECTED, _connected }, 111 { EFL_NET_DIALER_EVENT_DIALER_CONNECTED, _connected },
112 { EFL_NET_DIALER_EVENT_RESOLVED, _resolved }, 112 { EFL_NET_DIALER_EVENT_DIALER_RESOLVED, _resolved },
113 { EFL_NET_DIALER_EVENT_ERROR, _error }, 113 { EFL_NET_DIALER_EVENT_DIALER_ERROR, _error },
114 { EFL_IO_READER_EVENT_EOS, _eos }, 114 { EFL_IO_READER_EVENT_EOS, _eos },
115 { EFL_IO_READER_EVENT_CAN_READ_CHANGED, _can_read }, 115 { EFL_IO_READER_EVENT_CAN_READ_CHANGED, _can_read },
116 { EFL_IO_WRITER_EVENT_CAN_WRITE_CHANGED, _can_write } 116 { EFL_IO_WRITER_EVENT_CAN_WRITE_CHANGED, _can_write }
diff --git a/src/examples/ecore/efl_net_dialer_websocket_autobahntestee.c b/src/examples/ecore/efl_net_dialer_websocket_autobahntestee.c
index 037a0aca52..45a3ed2ae4 100644
--- a/src/examples/ecore/efl_net_dialer_websocket_autobahntestee.c
+++ b/src/examples/ecore/efl_net_dialer_websocket_autobahntestee.c
@@ -247,8 +247,8 @@ EFL_CALLBACKS_ARRAY_DEFINE(dialer_cbs,
247 { EFL_NET_DIALER_WEBSOCKET_EVENT_CLOSED_REASON, _ws_closed_reason }, 247 { EFL_NET_DIALER_WEBSOCKET_EVENT_CLOSED_REASON, _ws_closed_reason },
248 { EFL_NET_DIALER_WEBSOCKET_EVENT_MESSAGE_TEXT, _ws_message_text }, 248 { EFL_NET_DIALER_WEBSOCKET_EVENT_MESSAGE_TEXT, _ws_message_text },
249 { EFL_NET_DIALER_WEBSOCKET_EVENT_MESSAGE_BINARY, _ws_message_binary }, 249 { EFL_NET_DIALER_WEBSOCKET_EVENT_MESSAGE_BINARY, _ws_message_binary },
250 { EFL_NET_DIALER_EVENT_CONNECTED, _connected }, 250 { EFL_NET_DIALER_EVENT_DIALER_CONNECTED, _connected },
251 { EFL_NET_DIALER_EVENT_ERROR, _error }, 251 { EFL_NET_DIALER_EVENT_DIALER_ERROR, _error },
252 { EFL_IO_CLOSER_EVENT_CLOSED, _closed }, 252 { EFL_IO_CLOSER_EVENT_CLOSED, _closed },
253 { EFL_IO_READER_EVENT_EOS, _eos }, 253 { EFL_IO_READER_EVENT_EOS, _eos },
254 { EFL_EVENT_DEL, _del }); 254 { EFL_EVENT_DEL, _del });
diff --git a/src/examples/ecore/efl_net_dialer_websocket_example.c b/src/examples/ecore/efl_net_dialer_websocket_example.c
index e46a8c78a9..a74323b3db 100644
--- a/src/examples/ecore/efl_net_dialer_websocket_example.c
+++ b/src/examples/ecore/efl_net_dialer_websocket_example.c
@@ -145,9 +145,9 @@ EFL_CALLBACKS_ARRAY_DEFINE(dialer_cbs,
145 { EFL_NET_DIALER_WEBSOCKET_EVENT_CLOSED_REASON, _ws_closed_reason }, 145 { EFL_NET_DIALER_WEBSOCKET_EVENT_CLOSED_REASON, _ws_closed_reason },
146 { EFL_NET_DIALER_WEBSOCKET_EVENT_MESSAGE_TEXT, _ws_message_text }, 146 { EFL_NET_DIALER_WEBSOCKET_EVENT_MESSAGE_TEXT, _ws_message_text },
147 { EFL_NET_DIALER_WEBSOCKET_EVENT_MESSAGE_BINARY, _ws_message_binary }, 147 { EFL_NET_DIALER_WEBSOCKET_EVENT_MESSAGE_BINARY, _ws_message_binary },
148 { EFL_NET_DIALER_EVENT_CONNECTED, _connected }, 148 { EFL_NET_DIALER_EVENT_DIALER_CONNECTED, _connected },
149 { EFL_NET_DIALER_EVENT_RESOLVED, _resolved }, 149 { EFL_NET_DIALER_EVENT_DIALER_RESOLVED, _resolved },
150 { EFL_NET_DIALER_EVENT_ERROR, _error }, 150 { EFL_NET_DIALER_EVENT_DIALER_ERROR, _error },
151 { EFL_IO_CLOSER_EVENT_CLOSED, _closed }, 151 { EFL_IO_CLOSER_EVENT_CLOSED, _closed },
152 { EFL_IO_READER_EVENT_EOS, _eos }); 152 { EFL_IO_READER_EVENT_EOS, _eos });
153 153
diff --git a/src/examples/ecore/efl_net_dialer_windows_example.c b/src/examples/ecore/efl_net_dialer_windows_example.c
index 44daab0bfa..e5be598eac 100644
--- a/src/examples/ecore/efl_net_dialer_windows_example.c
+++ b/src/examples/ecore/efl_net_dialer_windows_example.c
@@ -106,9 +106,9 @@ _error(void *data EINA_UNUSED, const Efl_Event *event)
106} 106}
107 107
108EFL_CALLBACKS_ARRAY_DEFINE(dialer_cbs, 108EFL_CALLBACKS_ARRAY_DEFINE(dialer_cbs,
109 { EFL_NET_DIALER_EVENT_CONNECTED, _connected }, 109 { EFL_NET_DIALER_EVENT_DIALER_CONNECTED, _connected },
110 { EFL_NET_DIALER_EVENT_RESOLVED, _resolved }, 110 { EFL_NET_DIALER_EVENT_DIALER_RESOLVED, _resolved },
111 { EFL_NET_DIALER_EVENT_ERROR, _error }, 111 { EFL_NET_DIALER_EVENT_DIALER_ERROR, _error },
112 { EFL_IO_READER_EVENT_EOS, _eos }, 112 { EFL_IO_READER_EVENT_EOS, _eos },
113 { EFL_IO_READER_EVENT_CAN_READ_CHANGED, _can_read }, 113 { EFL_IO_READER_EVENT_CAN_READ_CHANGED, _can_read },
114 { EFL_IO_WRITER_EVENT_CAN_WRITE_CHANGED, _can_write } 114 { EFL_IO_WRITER_EVENT_CAN_WRITE_CHANGED, _can_write }
diff --git a/src/examples/ecore/efl_net_server_example.c b/src/examples/ecore/efl_net_server_example.c
index b599336960..4c3f200339 100644
--- a/src/examples/ecore/efl_net_server_example.c
+++ b/src/examples/ecore/efl_net_server_example.c
@@ -450,7 +450,7 @@ _server_serving(void *data EINA_UNUSED, const Efl_Event *event)
450EFL_CALLBACKS_ARRAY_DEFINE(server_cbs, 450EFL_CALLBACKS_ARRAY_DEFINE(server_cbs,
451 { EFL_NET_SERVER_EVENT_CLIENT_ADD, _server_client_add }, 451 { EFL_NET_SERVER_EVENT_CLIENT_ADD, _server_client_add },
452 { EFL_NET_SERVER_EVENT_CLIENT_REJECTED, _server_client_rejected }, 452 { EFL_NET_SERVER_EVENT_CLIENT_REJECTED, _server_client_rejected },
453 { EFL_NET_SERVER_EVENT_ERROR, _server_error }, 453 { EFL_NET_SERVER_EVENT_SERVER_ERROR, _server_error },
454 { EFL_NET_SERVER_EVENT_SERVING, _server_serving }); 454 { EFL_NET_SERVER_EVENT_SERVING, _server_serving });
455 455
456static const char * protocols[] = { 456static const char * protocols[] = {
diff --git a/src/examples/ecore/efl_net_server_simple_example.c b/src/examples/ecore/efl_net_server_simple_example.c
index 6477ad2a3d..36a2d8c06d 100644
--- a/src/examples/ecore/efl_net_server_simple_example.c
+++ b/src/examples/ecore/efl_net_server_simple_example.c
@@ -254,7 +254,7 @@ _server_serving(void *data EINA_UNUSED, const Efl_Event *event)
254EFL_CALLBACKS_ARRAY_DEFINE(server_cbs, 254EFL_CALLBACKS_ARRAY_DEFINE(server_cbs,
255 { EFL_NET_SERVER_EVENT_CLIENT_ADD, _server_client_add }, 255 { EFL_NET_SERVER_EVENT_CLIENT_ADD, _server_client_add },
256 { EFL_NET_SERVER_EVENT_CLIENT_REJECTED, _server_client_rejected }, 256 { EFL_NET_SERVER_EVENT_CLIENT_REJECTED, _server_client_rejected },
257 { EFL_NET_SERVER_EVENT_ERROR, _server_error }, 257 { EFL_NET_SERVER_EVENT_SERVER_ERROR, _server_error },
258 { EFL_NET_SERVER_EVENT_SERVING, _server_serving }); 258 { EFL_NET_SERVER_EVENT_SERVING, _server_serving });
259 259
260static const char * protocols[] = { 260static const char * protocols[] = {
diff --git a/src/examples/ecore/efl_net_socket_ssl_dialer_example.c b/src/examples/ecore/efl_net_socket_ssl_dialer_example.c
index 0bc77c3477..1ade6bc9c2 100644
--- a/src/examples/ecore/efl_net_socket_ssl_dialer_example.c
+++ b/src/examples/ecore/efl_net_socket_ssl_dialer_example.c
@@ -177,9 +177,9 @@ _error(void *data EINA_UNUSED, const Efl_Event *event)
177} 177}
178 178
179EFL_CALLBACKS_ARRAY_DEFINE(dialer_cbs, 179EFL_CALLBACKS_ARRAY_DEFINE(dialer_cbs,
180 { EFL_NET_DIALER_EVENT_CONNECTED, _connected }, 180 { EFL_NET_DIALER_EVENT_DIALER_CONNECTED, _connected },
181 { EFL_NET_DIALER_EVENT_RESOLVED, _resolved }, 181 { EFL_NET_DIALER_EVENT_DIALER_RESOLVED, _resolved },
182 { EFL_NET_DIALER_EVENT_ERROR, _error }); 182 { EFL_NET_DIALER_EVENT_DIALER_ERROR, _error });
183 183
184 184
185static char * 185static char *
diff --git a/src/examples/ecore/efl_net_socket_ssl_server_example.c b/src/examples/ecore/efl_net_socket_ssl_server_example.c
index 33b67d2b21..6d826b6047 100644
--- a/src/examples/ecore/efl_net_socket_ssl_server_example.c
+++ b/src/examples/ecore/efl_net_socket_ssl_server_example.c
@@ -153,7 +153,7 @@ _server_serving(void *data EINA_UNUSED, const Efl_Event *event)
153 153
154EFL_CALLBACKS_ARRAY_DEFINE(server_cbs, 154EFL_CALLBACKS_ARRAY_DEFINE(server_cbs,
155 { EFL_NET_SERVER_EVENT_CLIENT_ADD, _server_client_add }, 155 { EFL_NET_SERVER_EVENT_CLIENT_ADD, _server_client_add },
156 { EFL_NET_SERVER_EVENT_ERROR, _server_error }, 156 { EFL_NET_SERVER_EVENT_SERVER_ERROR, _server_error },
157 { EFL_NET_SERVER_EVENT_SERVING, _server_serving }); 157 { EFL_NET_SERVER_EVENT_SERVING, _server_serving });
158 158
159static const char *ciphers_strs[] = { 159static const char *ciphers_strs[] = {