summaryrefslogtreecommitdiff
path: root/src/lib/ecore_con
diff options
context:
space:
mode:
authorTom Hacohen <tom@stosb.com>2015-02-23 16:38:00 +0000
committerTom Hacohen <tom@stosb.com>2015-02-23 17:16:02 +0000
commit648ad2591c196eb4be5f4972859675596dc61711 (patch)
tree726928ee83a3bf7788d8d762e4b3dc464871969d /src/lib/ecore_con
parenta791d97bfcc7ae66f63e9fa694292bd7a0fc3610 (diff)
Fix code to conform to recent Eo changes.
Diffstat (limited to 'src/lib/ecore_con')
-rw-r--r--src/lib/ecore_con/ecore_con.c45
1 files changed, 30 insertions, 15 deletions
diff --git a/src/lib/ecore_con/ecore_con.c b/src/lib/ecore_con/ecore_con.c
index 1c25a50245..a440bcd56d 100644
--- a/src/lib/ecore_con/ecore_con.c
+++ b/src/lib/ecore_con/ecore_con.c
@@ -108,7 +108,8 @@ static void _ecore_con_lookup_done(void *data,
108static const char *_ecore_con_pretty_ip(struct sockaddr *client_addr); 108static const char *_ecore_con_pretty_ip(struct sockaddr *client_addr);
109 109
110#define EO_CONSTRUCTOR_CHECK_RETURN(obj) do { \ 110#define EO_CONSTRUCTOR_CHECK_RETURN(obj) do { \
111 if (eo_do(obj, eo_finalized_get())) \ 111 Eina_Bool finalized; \
112 if (eo_do_ret(obj, finalized, eo_finalized_get())) \
112 { \ 113 { \
113 ERR("This function is only allowed during construction."); \ 114 ERR("This function is only allowed during construction."); \
114 return; \ 115 return; \
@@ -554,7 +555,8 @@ _ecore_con_server_ecore_con_base_timeout_set(Eo *obj, Ecore_Con_Server_Data *svr
554EAPI double 555EAPI double
555ecore_con_server_timeout_get(const Ecore_Con *obj) 556ecore_con_server_timeout_get(const Ecore_Con *obj)
556{ 557{
557 return eo_do((Ecore_Con *)obj, ecore_con_obj_timeout_get()); 558 double ret;
559 return eo_do_ret((Ecore_Con *)obj, ret, ecore_con_obj_timeout_get());
558} 560}
559 561
560EOLIAN static double 562EOLIAN static double
@@ -607,7 +609,8 @@ ecore_con_server_data_set(Ecore_Con_Server *obj,
607EAPI Eina_Bool 609EAPI Eina_Bool
608ecore_con_server_connected_get(const Ecore_Con *obj) 610ecore_con_server_connected_get(const Ecore_Con *obj)
609{ 611{
610 return eo_do((Ecore_Con *)obj, ecore_con_obj_connected_get()); 612 Eina_Bool ret;
613 return eo_do_ret((Ecore_Con *)obj, ret, ecore_con_obj_connected_get());
611} 614}
612 615
613EOLIAN static Eina_Bool 616EOLIAN static Eina_Bool
@@ -656,7 +659,8 @@ _ecore_con_server_name_get(Eo *obj EINA_UNUSED, Ecore_Con_Server_Data *svr)
656EAPI int 659EAPI int
657ecore_con_server_port_get(const Ecore_Con *obj) 660ecore_con_server_port_get(const Ecore_Con *obj)
658{ 661{
659 return eo_do((Ecore_Con *)obj, ecore_con_obj_port_get()); 662 int ret;
663 return eo_do_ret((Ecore_Con *)obj, ret, ecore_con_obj_port_get());
660} 664}
661 665
662EOLIAN static void 666EOLIAN static void
@@ -676,7 +680,8 @@ _ecore_con_server_ecore_con_base_port_get(Eo *obj EINA_UNUSED, Ecore_Con_Server_
676EAPI int 680EAPI int
677ecore_con_server_send(Ecore_Con *obj, const void *data, int size) 681ecore_con_server_send(Ecore_Con *obj, const void *data, int size)
678{ 682{
679 return eo_do((Ecore_Con *)obj, ecore_con_obj_send(data, size)); 683 int ret;
684 return eo_do_ret((Ecore_Con *)obj, ret, ecore_con_obj_send(data, size));
680} 685}
681 686
682EOLIAN static int 687EOLIAN static int
@@ -732,7 +737,8 @@ _ecore_con_server_client_limit_get(Eo *obj EINA_UNUSED, Ecore_Con_Server_Data *s
732EAPI const char * 737EAPI const char *
733ecore_con_server_ip_get(const Ecore_Con *obj) 738ecore_con_server_ip_get(const Ecore_Con *obj)
734{ 739{
735 return eo_do(obj, ecore_con_obj_ip_get()); 740 const char *ret;
741 return eo_do_ret(obj, ret, ecore_con_obj_ip_get());
736} 742}
737 743
738EOLIAN static const char * 744EOLIAN static const char *
@@ -744,7 +750,8 @@ _ecore_con_server_ecore_con_base_ip_get(Eo *obj EINA_UNUSED, Ecore_Con_Server_Da
744EAPI double 750EAPI double
745ecore_con_server_uptime_get(const Ecore_Con *obj) 751ecore_con_server_uptime_get(const Ecore_Con *obj)
746{ 752{
747 return eo_do(obj, ecore_con_obj_uptime_get()); 753 double ret;
754 return eo_do_ret(obj, ret, ecore_con_obj_uptime_get());
748} 755}
749 756
750EOLIAN static double 757EOLIAN static double
@@ -785,7 +792,8 @@ _ecore_con_server_ecore_con_base_flush(Eo *obj, Ecore_Con_Server_Data *svr EINA_
785EAPI int 792EAPI int
786ecore_con_client_send(Ecore_Con *obj, const void *data, int size) 793ecore_con_client_send(Ecore_Con *obj, const void *data, int size)
787{ 794{
788 return eo_do((Ecore_Con *)obj, ecore_con_obj_send(data, size)); 795 int ret;
796 return eo_do_ret((Ecore_Con *)obj, ret, ecore_con_obj_send(data, size));
789} 797}
790 798
791EOLIAN static int 799EOLIAN static int
@@ -852,7 +860,8 @@ _ecore_con_client_ecore_con_base_connected_get(Eo *obj EINA_UNUSED, Ecore_Con_Cl
852EAPI Eina_Bool 860EAPI Eina_Bool
853ecore_con_client_connected_get(const Ecore_Con *obj) 861ecore_con_client_connected_get(const Ecore_Con *obj)
854{ 862{
855 return eo_do((Ecore_Con *)obj, ecore_con_obj_connected_get()); 863 Eina_Bool ret;
864 return eo_do_ret((Ecore_Con *)obj, ret, ecore_con_obj_connected_get());
856} 865}
857 866
858EOLIAN static void 867EOLIAN static void
@@ -878,7 +887,8 @@ _ecore_con_client_ecore_con_base_timeout_get(Eo *obj EINA_UNUSED, Ecore_Con_Clie
878EAPI double 887EAPI double
879ecore_con_client_timeout_get(const Ecore_Con *obj) 888ecore_con_client_timeout_get(const Ecore_Con *obj)
880{ 889{
881 return eo_do((Ecore_Con *)obj, ecore_con_obj_timeout_get()); 890 double ret;
891 return eo_do_ret((Ecore_Con *)obj, ret, ecore_con_obj_timeout_get());
882} 892}
883 893
884EAPI void * 894EAPI void *
@@ -929,7 +939,8 @@ _ecore_con_client_ecore_con_base_ip_get(Eo *obj EINA_UNUSED, Ecore_Con_Client_Da
929EAPI const char * 939EAPI const char *
930ecore_con_client_ip_get(const Ecore_Con *obj) 940ecore_con_client_ip_get(const Ecore_Con *obj)
931{ 941{
932 return eo_do(obj, ecore_con_obj_ip_get()); 942 const char *ret;
943 return eo_do_ret(obj, ret, ecore_con_obj_ip_get());
933} 944}
934 945
935EOLIAN static int 946EOLIAN static int
@@ -947,7 +958,8 @@ _ecore_con_client_ecore_con_base_port_get(Eo *obj EINA_UNUSED, Ecore_Con_Client_
947EAPI int 958EAPI int
948ecore_con_client_port_get(const Ecore_Con *obj) 959ecore_con_client_port_get(const Ecore_Con *obj)
949{ 960{
950 return eo_do((Ecore_Con *)obj, ecore_con_obj_port_get()); 961 int ret;
962 return eo_do_ret((Ecore_Con *)obj, ret, ecore_con_obj_port_get());
951} 963}
952 964
953EOLIAN static double 965EOLIAN static double
@@ -959,7 +971,8 @@ _ecore_con_client_ecore_con_base_uptime_get(Eo *obj EINA_UNUSED, Ecore_Con_Clien
959EAPI double 971EAPI double
960ecore_con_client_uptime_get(const Ecore_Con *obj) 972ecore_con_client_uptime_get(const Ecore_Con *obj)
961{ 973{
962 return eo_do(obj, ecore_con_obj_uptime_get()); 974 double ret;
975 return eo_do_ret(obj, ret, ecore_con_obj_uptime_get());
963} 976}
964 977
965EOLIAN static void 978EOLIAN static void
@@ -977,7 +990,8 @@ ecore_con_client_flush(Ecore_Con *obj)
977EAPI int 990EAPI int
978ecore_con_server_fd_get(const Ecore_Con *obj) 991ecore_con_server_fd_get(const Ecore_Con *obj)
979{ 992{
980 return eo_do((Ecore_Con *)obj, ecore_con_obj_fd_get()); 993 int ret;
994 return eo_do_ret((Ecore_Con *)obj, ret, ecore_con_obj_fd_get());
981} 995}
982 996
983EOLIAN static int 997EOLIAN static int
@@ -997,7 +1011,8 @@ _ecore_con_client_ecore_con_base_fd_get(Eo *obj EINA_UNUSED, Ecore_Con_Client_Da
997EAPI int 1011EAPI int
998ecore_con_client_fd_get(const Ecore_Con *obj) 1012ecore_con_client_fd_get(const Ecore_Con *obj)
999{ 1013{
1000 return eo_do((Ecore_Con *)obj, ecore_con_obj_fd_get()); 1014 int ret;
1015 return eo_do_ret((Ecore_Con *)obj, ret, ecore_con_obj_fd_get());
1001} 1016}
1002 1017
1003/** 1018/**