more eo simplified to use Eina_Slice instead of pointer to.
Working directly with Eina_Slice is easier than a pointer to it, requires no validation of the pointers and is cheap since it's just putting together size_t + void*. However we can't hint the user of 'const(Eina.Slice)' properties as Eolian is incorrectly generating getters as: const Eina_Slice class_property_get(...) which is makes compilers complain about ignored qualifiers: ../src/lib/ecore/efl_io_copier.eo.h:329:7: warning: 'const' type qualifier on return type has no effect [-Wignored-qualifiers] Leave some TODO so @q66 can fix those.
This commit is contained in:
parent
8c2013d090
commit
1d86cbfab4
|
@ -266,7 +266,7 @@ main(int argc, char **argv)
|
||||||
stream = efl_add(EFL_IO_BUFFERED_STREAM_CLASS, loop,
|
stream = efl_add(EFL_IO_BUFFERED_STREAM_CLASS, loop,
|
||||||
efl_name_set(efl_added, "stream"),
|
efl_name_set(efl_added, "stream"),
|
||||||
efl_io_buffered_stream_inner_io_set(efl_added, dialer), /* mandatory! */
|
efl_io_buffered_stream_inner_io_set(efl_added, dialer), /* mandatory! */
|
||||||
efl_io_buffered_stream_line_delimiter_set(efl_added, &line_delimiter),
|
efl_io_buffered_stream_line_delimiter_set(efl_added, line_delimiter),
|
||||||
efl_io_buffered_stream_max_queue_size_input_set(efl_added, buffer_limit),
|
efl_io_buffered_stream_max_queue_size_input_set(efl_added, buffer_limit),
|
||||||
efl_io_buffered_stream_max_queue_size_output_set(efl_added, buffer_limit),
|
efl_io_buffered_stream_max_queue_size_output_set(efl_added, buffer_limit),
|
||||||
efl_event_callback_array_add(efl_added, stream_cbs(), NULL));
|
efl_event_callback_array_add(efl_added, stream_cbs(), NULL));
|
||||||
|
|
|
@ -880,7 +880,7 @@ main(int argc, char **argv)
|
||||||
copier = efl_add(EFL_IO_COPIER_CLASS, ecore_main_loop_get(),
|
copier = efl_add(EFL_IO_COPIER_CLASS, ecore_main_loop_get(),
|
||||||
efl_io_copier_source_set(efl_added, input), /* mandatory */
|
efl_io_copier_source_set(efl_added, input), /* mandatory */
|
||||||
efl_io_copier_destination_set(efl_added, output), /* optional, see :none: */
|
efl_io_copier_destination_set(efl_added, output), /* optional, see :none: */
|
||||||
efl_io_copier_line_delimiter_set(efl_added, &line_delm_slice), /* optional */
|
efl_io_copier_line_delimiter_set(efl_added, line_delm_slice), /* optional */
|
||||||
efl_io_copier_buffer_limit_set(efl_added, buffer_limit), /* optional, defaults to unlimited */
|
efl_io_copier_buffer_limit_set(efl_added, buffer_limit), /* optional, defaults to unlimited */
|
||||||
efl_io_copier_read_chunk_size_set(efl_added, read_chunk_size), /* optional, defaults to 4096 */
|
efl_io_copier_read_chunk_size_set(efl_added, read_chunk_size), /* optional, defaults to 4096 */
|
||||||
efl_io_copier_timeout_inactivity_set(efl_added, timeout), /* optional, defaults to 0.0 (disabled) */
|
efl_io_copier_timeout_inactivity_set(efl_added, timeout), /* optional, defaults to 0.0 (disabled) */
|
||||||
|
|
|
@ -301,7 +301,7 @@ main(int argc, char **argv)
|
||||||
/* sender: send_queue->network */
|
/* sender: send_queue->network */
|
||||||
sender = efl_add(EFL_IO_COPIER_CLASS, loop,
|
sender = efl_add(EFL_IO_COPIER_CLASS, loop,
|
||||||
efl_name_set(efl_added, "sender"),
|
efl_name_set(efl_added, "sender"),
|
||||||
efl_io_copier_line_delimiter_set(efl_added, &line_delimiter),
|
efl_io_copier_line_delimiter_set(efl_added, line_delimiter),
|
||||||
efl_io_copier_source_set(efl_added, send_queue),
|
efl_io_copier_source_set(efl_added, send_queue),
|
||||||
efl_io_copier_destination_set(efl_added, dialer),
|
efl_io_copier_destination_set(efl_added, dialer),
|
||||||
efl_event_callback_array_add(efl_added, copier_cbs(), NULL));
|
efl_event_callback_array_add(efl_added, copier_cbs(), NULL));
|
||||||
|
@ -315,7 +315,7 @@ main(int argc, char **argv)
|
||||||
/* receiver: network->receive_queue */
|
/* receiver: network->receive_queue */
|
||||||
receiver = efl_add(EFL_IO_COPIER_CLASS, loop,
|
receiver = efl_add(EFL_IO_COPIER_CLASS, loop,
|
||||||
efl_name_set(efl_added, "receiver"),
|
efl_name_set(efl_added, "receiver"),
|
||||||
efl_io_copier_line_delimiter_set(efl_added, &line_delimiter),
|
efl_io_copier_line_delimiter_set(efl_added, line_delimiter),
|
||||||
efl_io_copier_source_set(efl_added, dialer),
|
efl_io_copier_source_set(efl_added, dialer),
|
||||||
efl_io_copier_destination_set(efl_added, receive_queue),
|
efl_io_copier_destination_set(efl_added, receive_queue),
|
||||||
efl_event_callback_array_add(efl_added, copier_cbs(), NULL));
|
efl_event_callback_array_add(efl_added, copier_cbs(), NULL));
|
||||||
|
|
|
@ -1416,7 +1416,7 @@ main(int argc EINA_UNUSED, char **argv EINA_UNUSED)
|
||||||
input = efl_add(EFL_IO_STDIN_CLASS, ecore_main_loop_get());
|
input = efl_add(EFL_IO_STDIN_CLASS, ecore_main_loop_get());
|
||||||
copier = efl_add(EFL_IO_COPIER_CLASS, ecore_main_loop_get(),
|
copier = efl_add(EFL_IO_COPIER_CLASS, ecore_main_loop_get(),
|
||||||
efl_io_copier_source_set(efl_added, input),
|
efl_io_copier_source_set(efl_added, input),
|
||||||
efl_io_copier_line_delimiter_set(efl_added, &line_delimiter),
|
efl_io_copier_line_delimiter_set(efl_added, line_delimiter),
|
||||||
efl_io_copier_buffer_limit_set(efl_added, 8192),
|
efl_io_copier_buffer_limit_set(efl_added, 8192),
|
||||||
efl_io_copier_read_chunk_size_set(efl_added, 8192),
|
efl_io_copier_read_chunk_size_set(efl_added, 8192),
|
||||||
efl_event_callback_add(efl_added, EFL_IO_COPIER_EVENT_LINE, _cmd_line, ctl));
|
efl_event_callback_add(efl_added, EFL_IO_COPIER_EVENT_LINE, _cmd_line, ctl));
|
||||||
|
|
|
@ -370,7 +370,7 @@ main(int argc, char **argv)
|
||||||
dialer = efl_add(EFL_NET_DIALER_SIMPLE_CLASS, loop,
|
dialer = efl_add(EFL_NET_DIALER_SIMPLE_CLASS, loop,
|
||||||
efl_name_set(efl_added, "dialer"),
|
efl_name_set(efl_added, "dialer"),
|
||||||
efl_net_dialer_simple_inner_class_set(efl_added, cls), /* alternatively you could create the inner dialer and set with efl_io_buffered_stream_inner_io_set() */
|
efl_net_dialer_simple_inner_class_set(efl_added, cls), /* alternatively you could create the inner dialer and set with efl_io_buffered_stream_inner_io_set() */
|
||||||
efl_io_buffered_stream_line_delimiter_set(efl_added, &line_delm_slice), /* optional */
|
efl_io_buffered_stream_line_delimiter_set(efl_added, line_delm_slice), /* optional */
|
||||||
efl_io_buffered_stream_max_queue_size_input_set(efl_added, buffer_limit), /* optional, defaults to unlimited */
|
efl_io_buffered_stream_max_queue_size_input_set(efl_added, buffer_limit), /* optional, defaults to unlimited */
|
||||||
efl_io_buffered_stream_max_queue_size_output_set(efl_added, buffer_limit), /* optional, defaults to unlimited */
|
efl_io_buffered_stream_max_queue_size_output_set(efl_added, buffer_limit), /* optional, defaults to unlimited */
|
||||||
efl_io_buffered_stream_read_chunk_size_set(efl_added, read_chunk_size), /* optional, defaults to 4096 */
|
efl_io_buffered_stream_read_chunk_size_set(efl_added, read_chunk_size), /* optional, defaults to 4096 */
|
||||||
|
|
|
@ -12,7 +12,7 @@ static Eina_List *resolving = NULL;
|
||||||
static void
|
static void
|
||||||
_print_ip_addr_info(const Eo *o)
|
_print_ip_addr_info(const Eo *o)
|
||||||
{
|
{
|
||||||
const Eina_Slice *addr;
|
Eina_Slice addr;
|
||||||
const struct sockaddr *sa;
|
const struct sockaddr *sa;
|
||||||
char buf[INET6_ADDRSTRLEN] = "?";
|
char buf[INET6_ADDRSTRLEN] = "?";
|
||||||
uint16_t port;
|
uint16_t port;
|
||||||
|
@ -23,9 +23,9 @@ _print_ip_addr_info(const Eo *o)
|
||||||
printf("INFO: - port: %hu\n", efl_net_ip_address_port_get(o));
|
printf("INFO: - port: %hu\n", efl_net_ip_address_port_get(o));
|
||||||
|
|
||||||
addr = efl_net_ip_address_get(o);
|
addr = efl_net_ip_address_get(o);
|
||||||
printf("INFO: - address %zd bytes:", addr->len);
|
printf("INFO: - address %zd bytes:", addr.len);
|
||||||
for (i = 0; i < addr->len; i++)
|
for (i = 0; i < addr.len; i++)
|
||||||
printf(" %#hhx", addr->bytes[i]);
|
printf(" %#hhx", addr.bytes[i]);
|
||||||
putchar('\n');
|
putchar('\n');
|
||||||
|
|
||||||
sa = efl_net_ip_address_sockaddr_get(o);
|
sa = efl_net_ip_address_sockaddr_get(o);
|
||||||
|
|
Loading…
Reference in New Issue