From: Derek Foreman Date: Tue, 17 Apr 2018 19:49:20 +0000 (-0500) Subject: ecore_con: Fix build X-Git-Tag: upstream/1.21.0~1122 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9a3f2f653ab950640fe5ae3bc8a4851083517ed3;p=platform%2Fupstream%2Fefl.git ecore_con: Fix build commit fcae7cab276c2d3b19bb913ad908b67b7dd33089 broke connman stuff, I've blindly fixed it up here. I don't actually use or test ant of this but apparently I build it. If it's broken, please mail the pieces to Daniel Kolesa. Ref T6859 I guess --- 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 9657d39..30e6f2a 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 @@ -75,7 +75,7 @@ _efl_net_control_access_point_property_set_cb(void *data, const Eldbus_Message * } static void -_efl_net_control_access_point_property_set_string_array(Eo *o, Efl_Net_Control_Access_Point_Data *pd, const char *name, Eina_Iterator *it) +_efl_net_control_access_point_property_set_string_array(const Eo *o, Efl_Net_Control_Access_Point_Data *pd, const char *name, Eina_Iterator *it) { Eldbus_Message *msg; Eldbus_Message_Iter *msg_itr, *var, *array; @@ -112,7 +112,7 @@ _efl_net_control_access_point_property_set_string_array(Eo *o, Efl_Net_Control_A } static void -_efl_net_control_access_point_property_set(Eo *o, Efl_Net_Control_Access_Point_Data *pd, const char *name, const char *signature, ...) +_efl_net_control_access_point_property_set(const Eo *o, Efl_Net_Control_Access_Point_Data *pd, const char *name, const char *signature, ...) { Eldbus_Message *msg; Eldbus_Message_Iter *msg_itr, *var; @@ -205,19 +205,19 @@ _efl_net_control_access_point_efl_object_destructor(Eo *o, Efl_Net_Control_Acces } EOLIAN static Efl_Net_Control_Access_Point_State -_efl_net_control_access_point_state_get(Eo *o EINA_UNUSED, Efl_Net_Control_Access_Point_Data *pd) +_efl_net_control_access_point_state_get(const Eo *o EINA_UNUSED, Efl_Net_Control_Access_Point_Data *pd) { return pd->state; } EOLIAN static Efl_Net_Control_Access_Point_Error -_efl_net_control_access_point_error_get(Eo *o EINA_UNUSED, Efl_Net_Control_Access_Point_Data *pd) +_efl_net_control_access_point_error_get(const Eo *o EINA_UNUSED, Efl_Net_Control_Access_Point_Data *pd) { return pd->error; } EOLIAN static const char * -_efl_net_control_access_point_ssid_get(Eo *o EINA_UNUSED, Efl_Net_Control_Access_Point_Data *pd) +_efl_net_control_access_point_ssid_get(const Eo *o EINA_UNUSED, Efl_Net_Control_Access_Point_Data *pd) { return pd->name; } @@ -312,25 +312,25 @@ _efl_net_control_access_point_priority_set(Eo *o, Efl_Net_Control_Access_Point_D } EOLIAN static unsigned int -_efl_net_control_access_point_priority_get(Eo *o EINA_UNUSED, Efl_Net_Control_Access_Point_Data *pd) +_efl_net_control_access_point_priority_get(const Eo *o EINA_UNUSED, Efl_Net_Control_Access_Point_Data *pd) { return pd->priority; } EOLIAN static Efl_Net_Control_Technology * -_efl_net_control_access_point_technology_get(Eo *o, Efl_Net_Control_Access_Point_Data *pd) +_efl_net_control_access_point_technology_get(const Eo *o, Efl_Net_Control_Access_Point_Data *pd) { return efl_net_connman_control_find_technology_by_type(efl_parent_get(o), pd->techname); } EOLIAN static uint8_t -_efl_net_control_access_point_strength_get(Eo *o EINA_UNUSED, Efl_Net_Control_Access_Point_Data *pd) +_efl_net_control_access_point_strength_get(const Eo *o EINA_UNUSED, Efl_Net_Control_Access_Point_Data *pd) { return pd->strength; } EOLIAN static Eina_Bool -_efl_net_control_access_point_roaming_get(Eo *o EINA_UNUSED, Efl_Net_Control_Access_Point_Data *pd) +_efl_net_control_access_point_roaming_get(const Eo *o EINA_UNUSED, Efl_Net_Control_Access_Point_Data *pd) { return pd->roaming; } @@ -342,49 +342,49 @@ _efl_net_control_access_point_auto_connect_set(Eo *o, Efl_Net_Control_Access_Poi } EOLIAN static Eina_Bool -_efl_net_control_access_point_auto_connect_get(Eo *o EINA_UNUSED, Efl_Net_Control_Access_Point_Data *pd) +_efl_net_control_access_point_auto_connect_get(const Eo *o EINA_UNUSED, Efl_Net_Control_Access_Point_Data *pd) { return pd->auto_connect; } EOLIAN static Eina_Bool -_efl_net_control_access_point_remembered_get(Eo *o EINA_UNUSED, Efl_Net_Control_Access_Point_Data *pd) +_efl_net_control_access_point_remembered_get(const Eo *o EINA_UNUSED, Efl_Net_Control_Access_Point_Data *pd) { return pd->remembered; } EOLIAN static Eina_Bool -_efl_net_control_access_point_immutable_get(Eo *o EINA_UNUSED, Efl_Net_Control_Access_Point_Data *pd) +_efl_net_control_access_point_immutable_get(const Eo *o EINA_UNUSED, Efl_Net_Control_Access_Point_Data *pd) { return pd->immutable; } EOLIAN static Efl_Net_Control_Access_Point_Security -_efl_net_control_access_point_security_get(Eo *o EINA_UNUSED, Efl_Net_Control_Access_Point_Data *pd) +_efl_net_control_access_point_security_get(const Eo *o EINA_UNUSED, Efl_Net_Control_Access_Point_Data *pd) { return pd->security; } EOLIAN static Eina_Iterator * -_efl_net_control_access_point_name_servers_get(Eo *o EINA_UNUSED, Efl_Net_Control_Access_Point_Data *pd) +_efl_net_control_access_point_name_servers_get(const Eo *o EINA_UNUSED, Efl_Net_Control_Access_Point_Data *pd) { return eina_list_iterator_new(pd->actual.name_servers); } EOLIAN static Eina_Iterator * -_efl_net_control_access_point_time_servers_get(Eo *o EINA_UNUSED, Efl_Net_Control_Access_Point_Data *pd) +_efl_net_control_access_point_time_servers_get(const Eo *o EINA_UNUSED, Efl_Net_Control_Access_Point_Data *pd) { return eina_list_iterator_new(pd->actual.time_servers); } EOLIAN static Eina_Iterator * -_efl_net_control_access_point_domains_get(Eo *o EINA_UNUSED, Efl_Net_Control_Access_Point_Data *pd) +_efl_net_control_access_point_domains_get(const Eo *o EINA_UNUSED, Efl_Net_Control_Access_Point_Data *pd) { return eina_list_iterator_new(pd->actual.domains); } EOLIAN static void -_efl_net_control_access_point_ipv4_get(Eo *o EINA_UNUSED, Efl_Net_Control_Access_Point_Data *pd, Efl_Net_Control_Access_Point_Ipv4_Method *method, const char **address, const char **netmask, const char **gateway) +_efl_net_control_access_point_ipv4_get(const Eo *o EINA_UNUSED, Efl_Net_Control_Access_Point_Data *pd, Efl_Net_Control_Access_Point_Ipv4_Method *method, const char **address, const char **netmask, const char **gateway) { if (method) *method = pd->actual.ipv4.method; if (address) *address = pd->actual.ipv4.address; @@ -393,7 +393,7 @@ _efl_net_control_access_point_ipv4_get(Eo *o EINA_UNUSED, Efl_Net_Control_Access } EOLIAN static void -_efl_net_control_access_point_ipv6_get(Eo *o EINA_UNUSED, Efl_Net_Control_Access_Point_Data *pd, Efl_Net_Control_Access_Point_Ipv6_Method *method, const char **address, uint8_t *prefix_length, const char **netmask, const char **gateway) +_efl_net_control_access_point_ipv6_get(const Eo *o EINA_UNUSED, Efl_Net_Control_Access_Point_Data *pd, Efl_Net_Control_Access_Point_Ipv6_Method *method, const char **address, uint8_t *prefix_length, const char **netmask, const char **gateway) { if (method) *method = pd->actual.ipv6.method; if (address) *address = pd->actual.ipv6.address; @@ -403,7 +403,7 @@ _efl_net_control_access_point_ipv6_get(Eo *o EINA_UNUSED, Efl_Net_Control_Access } EOLIAN static void -_efl_net_control_access_point_proxy_get(Eo *o EINA_UNUSED, Efl_Net_Control_Access_Point_Data *pd, Efl_Net_Control_Access_Point_Proxy_Method *method, const char **url, Eina_Iterator **servers, Eina_Iterator **excludes) +_efl_net_control_access_point_proxy_get(const Eo *o EINA_UNUSED, Efl_Net_Control_Access_Point_Data *pd, Efl_Net_Control_Access_Point_Proxy_Method *method, const char **url, Eina_Iterator **servers, Eina_Iterator **excludes) { if (method) *method = pd->actual.proxy.method; if (url) *url = pd->actual.proxy.url; @@ -418,7 +418,7 @@ _efl_net_control_access_point_configuration_name_servers_set(Eo *o, Efl_Net_Cont } EOLIAN static Eina_Iterator * -_efl_net_control_access_point_configuration_name_servers_get(Eo *o EINA_UNUSED, Efl_Net_Control_Access_Point_Data *pd) +_efl_net_control_access_point_configuration_name_servers_get(const Eo *o EINA_UNUSED, Efl_Net_Control_Access_Point_Data *pd) { return eina_list_iterator_new(pd->configured.name_servers); } @@ -430,7 +430,7 @@ _efl_net_control_access_point_configuration_time_servers_set(Eo *o, Efl_Net_Cont } EOLIAN static Eina_Iterator * -_efl_net_control_access_point_configuration_time_servers_get(Eo *o EINA_UNUSED, Efl_Net_Control_Access_Point_Data *pd) +_efl_net_control_access_point_configuration_time_servers_get(const Eo *o EINA_UNUSED, Efl_Net_Control_Access_Point_Data *pd) { return eina_list_iterator_new(pd->configured.time_servers); } @@ -442,7 +442,7 @@ _efl_net_control_access_point_configuration_domains_set(Eo *o, Efl_Net_Control_A } EOLIAN static Eina_Iterator * -_efl_net_control_access_point_configuration_domains_get(Eo *o EINA_UNUSED, Efl_Net_Control_Access_Point_Data *pd) +_efl_net_control_access_point_configuration_domains_get(const Eo *o EINA_UNUSED, Efl_Net_Control_Access_Point_Data *pd) { return eina_list_iterator_new(pd->configured.domains); } @@ -552,7 +552,7 @@ _efl_net_control_access_point_configuration_ipv4_set(Eo *o, Efl_Net_Control_Acce } EOLIAN static void -_efl_net_control_access_point_configuration_ipv4_get(Eo *o EINA_UNUSED, Efl_Net_Control_Access_Point_Data *pd, Efl_Net_Control_Access_Point_Ipv4_Method *method, const char **address, const char **netmask, const char **gateway) +_efl_net_control_access_point_configuration_ipv4_get(const Eo *o EINA_UNUSED, Efl_Net_Control_Access_Point_Data *pd, Efl_Net_Control_Access_Point_Ipv4_Method *method, const char **address, const char **netmask, const char **gateway) { if (method) *method = pd->configured.ipv4.method; if (address) *address = pd->configured.ipv4.address; @@ -640,7 +640,7 @@ _efl_net_control_access_point_configuration_ipv6_set(Eo *o, Efl_Net_Control_Acce } EOLIAN static void -_efl_net_control_access_point_configuration_ipv6_get(Eo *o EINA_UNUSED, Efl_Net_Control_Access_Point_Data *pd, Efl_Net_Control_Access_Point_Ipv6_Method *method, const char **address, uint8_t *prefix_length, const char **netmask, const char **gateway) +_efl_net_control_access_point_configuration_ipv6_get(const Eo *o EINA_UNUSED, Efl_Net_Control_Access_Point_Data *pd, Efl_Net_Control_Access_Point_Ipv6_Method *method, const char **address, uint8_t *prefix_length, const char **netmask, const char **gateway) { if (method) *method = pd->configured.ipv6.method; if (address) *address = pd->configured.ipv6.address; @@ -714,7 +714,7 @@ _efl_net_control_access_point_configuration_proxy_set(Eo *o, Efl_Net_Control_Acc } EOLIAN static void -_efl_net_control_access_point_configuration_proxy_get(Eo *o EINA_UNUSED, Efl_Net_Control_Access_Point_Data *pd, Efl_Net_Control_Access_Point_Proxy_Method *method, const char **url, Eina_Iterator **servers, Eina_Iterator **excludes) +_efl_net_control_access_point_configuration_proxy_get(const Eo *o EINA_UNUSED, Efl_Net_Control_Access_Point_Data *pd, Efl_Net_Control_Access_Point_Proxy_Method *method, const char **url, Eina_Iterator **servers, Eina_Iterator **excludes) { if (method) *method = pd->configured.proxy.method; if (url) *url = pd->configured.proxy.url; diff --git a/src/lib/ecore_con/efl_net_session-connman.c b/src/lib/ecore_con/efl_net_session-connman.c index ca8362c..bcbc173 100644 --- a/src/lib/ecore_con/efl_net_session-connman.c +++ b/src/lib/ecore_con/efl_net_session-connman.c @@ -618,31 +618,31 @@ _efl_net_session_efl_object_destructor(Eo *o, Efl_Net_Session_Data *pd) } EOLIAN static const char * -_efl_net_session_network_name_get(Eo *o EINA_UNUSED, Efl_Net_Session_Data *pd) +_efl_net_session_network_name_get(const Eo *o EINA_UNUSED, Efl_Net_Session_Data *pd) { return pd->name; } EOLIAN static Efl_Net_Session_State -_efl_net_session_state_get(Eo *o EINA_UNUSED, Efl_Net_Session_Data *pd) +_efl_net_session_state_get(const Eo *o EINA_UNUSED, Efl_Net_Session_Data *pd) { return pd->state; } EOLIAN static Efl_Net_Session_Technology -_efl_net_session_technology_get(Eo *o EINA_UNUSED, Efl_Net_Session_Data *pd) +_efl_net_session_technology_get(const Eo *o EINA_UNUSED, Efl_Net_Session_Data *pd) { return pd->technology; } EOLIAN static const char * -_efl_net_session_interface_get(Eo *o EINA_UNUSED, Efl_Net_Session_Data *pd) +_efl_net_session_interface_get(const Eo *o EINA_UNUSED, Efl_Net_Session_Data *pd) { return pd->interface; } EOLIAN static void -_efl_net_session_ipv4_get(Eo *o EINA_UNUSED, Efl_Net_Session_Data *pd, const char **address, const char **netmask, const char **gateway) +_efl_net_session_ipv4_get(const Eo *o EINA_UNUSED, Efl_Net_Session_Data *pd, const char **address, const char **netmask, const char **gateway) { if (address) *address = pd->ipv4.address; if (netmask) *netmask = pd->ipv4.netmask; @@ -650,7 +650,7 @@ _efl_net_session_ipv4_get(Eo *o EINA_UNUSED, Efl_Net_Session_Data *pd, const cha } EOLIAN static void -_efl_net_session_ipv6_get(Eo *o EINA_UNUSED, Efl_Net_Session_Data *pd, const char **address, uint8_t *prefix_length, const char **netmask, const char **gateway) +_efl_net_session_ipv6_get(const Eo *o EINA_UNUSED, Efl_Net_Session_Data *pd, const char **address, uint8_t *prefix_length, const char **netmask, const char **gateway) { if (address) *address = pd->ipv6.address; if (netmask) *netmask = pd->ipv6.netmask;