From: Peter W. <pet...@we...> - 2008-10-06 17:13:22
|
Enlightenment SVN schrieb: > Log: > Another step toward IPv6 support with more cleanup. > > Patch from Arnaud de Turckheim. > > > Author: cedric > Date: 2008-10-06 09:40:01 -0700 (Mon, 06 Oct 2008) > New Revision: 36483 > > Modified: > trunk/ecore/src/lib/ecore_con/ecore_con.c trunk/ecore/src/lib/ecore_con/ecore_con_info.c > > Modified: trunk/ecore/src/lib/ecore_con/ecore_con.c > =================================================================== > --- trunk/ecore/src/lib/ecore_con/ecore_con.c 2008-10-06 15:58:21 UTC (rev 36482) > +++ trunk/ecore/src/lib/ecore_con/ecore_con.c 2008-10-06 16:40:01 UTC (rev 36483) > @@ -26,21 +26,23 @@ > # include <winsock2.h> > #endif > > -static void _ecore_con_cb_dns_lookup(void *data, struct hostent *he); > -static void _ecore_con_cb_udp_dns_lookup(void *data, struct hostent *he); > static void _ecore_con_cb_tcp_connect(void *data, Ecore_Con_Netinfo *info); > static void _ecore_con_cb_udp_connect(void *data, Ecore_Con_Netinfo *info); > static void _ecore_con_cb_tcp_listen(void *data, Ecore_Con_Netinfo *info); > static void _ecore_con_cb_udp_listen(void *data, Ecore_Con_Netinfo *info); > + > static void _ecore_con_server_free(Ecore_Con_Server *svr); > static void _ecore_con_client_free(Ecore_Con_Client *cl); > + > static int _ecore_con_svr_handler(void *data, Ecore_Fd_Handler *fd_handler); > static int _ecore_con_cl_handler(void *data, Ecore_Fd_Handler *fd_handler); > static int _ecore_con_cl_udp_handler(void *data, Ecore_Fd_Handler *fd_handler); > static int _ecore_con_svr_udp_handler(void *data, Ecore_Fd_Handler *fd_handler); > static int _ecore_con_svr_cl_handler(void *data, Ecore_Fd_Handler *fd_handler); > + > static void _ecore_con_server_flush(Ecore_Con_Server *svr); > static void _ecore_con_client_flush(Ecore_Con_Client *cl); > + > static void _ecore_con_event_client_add_free(void *data, void *ev); > static void _ecore_con_event_client_del_free(void *data, void *ev); > static void _ecore_con_event_client_data_free(void *data, void *ev); > @@ -57,8 +59,25 @@ > > static Ecore_List *servers = NULL; > static int init_count = 0; > + > #if USE_OPENSSL > static int ssl_init_count = 0; > +static int _ecore_con_init_ssl(Ecore_Con_Server *svr); > +static int _ecore_con_shutdown_ssl(Ecore_Con_Server *svr); > +static int _ecore_con_free_ssl(Ecore_Con_Server *svr); > + > +# define INIT_SSL(svr) _ecore_con_init_ssl(svr) > +# define SHUTDOWN_SSL(svr) _ecore_con_shutdown_ssl(svr) > +# define FREE_SSL(svr) _ecore_con_free_ssl(svr) > +# define UNSET_SSL(svr) \ > + do { \ > + svr->ssl = NULL; \ > + svr->ssl_ctx = NULL; \ > + } while (0); > The point of using do {} while(0) in macros, fades away if you append a semicolon. > +#else > +# define INIT_SSL(svr) 0 > +# define SHUTDOWN_SSL(svr) 0 > +# define FREE_SSL(svr) 0 > #endi I haven't read the full code, but I think you are missing the UNSET_SSL() for the !OPENSSL case. Peter |
From: Vincent T. <vin...@gm...> - 2012-08-31 06:45:15
|
it will not cmopile on Windows. Follow what is in Ecore_Con.h and the doc ? Vincent On Fri, Aug 31, 2012 at 8:39 AM, Enlightenment SVN <no-...@en...> wrote: > Log: > ecore: add forgotten EAPI to Ecore_Con_Eet. > > > Author: cedric > Date: 2012-08-30 23:39:57 -0700 (Thu, 30 Aug 2012) > New Revision: 75919 > Trac: http://trac.enlightenment.org/e/changeset/75919 > > Modified: > trunk/ecore/src/lib/ecore_con/Ecore_Con_Eet.h trunk/ecore/src/lib/ecore_con/ecore_con_eet.c > > Modified: trunk/ecore/src/lib/ecore_con/Ecore_Con_Eet.h > =================================================================== > --- trunk/ecore/src/lib/ecore_con/Ecore_Con_Eet.h 2012-08-31 06:23:29 UTC (rev 75918) > +++ trunk/ecore/src/lib/ecore_con/Ecore_Con_Eet.h 2012-08-31 06:39:57 UTC (rev 75919) > @@ -13,35 +13,35 @@ > typedef Eina_Bool (*Ecore_Con_Eet_Client_Cb)(void *data, Ecore_Con_Reply *reply, Ecore_Con_Client *conn); > typedef Eina_Bool (*Ecore_Con_Eet_Server_Cb)(void *data, Ecore_Con_Reply *reply, Ecore_Con_Server *conn); > > -Ecore_Con_Eet *ecore_con_eet_server_new(Ecore_Con_Server *server); > -Ecore_Con_Eet *ecore_con_eet_client_new(Ecore_Con_Server *server); > -void ecore_con_eet_server_free(Ecore_Con_Eet *ece); > +EAPI Ecore_Con_Eet *ecore_con_eet_server_new(Ecore_Con_Server *server); > +EAPI Ecore_Con_Eet *ecore_con_eet_client_new(Ecore_Con_Server *server); > +EAPI void ecore_con_eet_server_free(Ecore_Con_Eet *ece); > > -void ecore_con_eet_register(Ecore_Con_Eet *ece, const char *name, Eet_Data_Descriptor *edd); > +EAPI void ecore_con_eet_register(Ecore_Con_Eet *ece, const char *name, Eet_Data_Descriptor *edd); > > -void ecore_con_eet_data_callback_add(Ecore_Con_Eet *ece, const char *name, Ecore_Con_Eet_Data_Cb func, const void *data); > -void ecore_con_eet_data_callback_del(Ecore_Con_Eet *ece, const char *name); > +EAPI void ecore_con_eet_data_callback_add(Ecore_Con_Eet *ece, const char *name, Ecore_Con_Eet_Data_Cb func, const void *data); > +EAPI void ecore_con_eet_data_callback_del(Ecore_Con_Eet *ece, const char *name); > > -void ecore_con_eet_raw_data_callback_add(Ecore_Con_Eet *ece, const char *name, Ecore_Con_Eet_Raw_Data_Cb func, const void *data); > -void ecore_con_eet_raw_data_callback_del(Ecore_Con_Eet *ece, const char *name); > +EAPI void ecore_con_eet_raw_data_callback_add(Ecore_Con_Eet *ece, const char *name, Ecore_Con_Eet_Raw_Data_Cb func, const void *data); > +EAPI void ecore_con_eet_raw_data_callback_del(Ecore_Con_Eet *ece, const char *name); > > -void ecore_con_eet_client_connect_callback_add(Ecore_Con_Eet *ece, Ecore_Con_Eet_Client_Cb func, const void *data); > -void ecore_con_eet_client_connect_callback_del(Ecore_Con_Eet *ece, Ecore_Con_Eet_Client_Cb func, const void *data); > +EAPI void ecore_con_eet_client_connect_callback_add(Ecore_Con_Eet *ece, Ecore_Con_Eet_Client_Cb func, const void *data); > +EAPI void ecore_con_eet_client_connect_callback_del(Ecore_Con_Eet *ece, Ecore_Con_Eet_Client_Cb func, const void *data); > > -void ecore_con_eet_client_disconnect_callback_add(Ecore_Con_Eet *ece, Ecore_Con_Eet_Client_Cb func, const void *data); > -void ecore_con_eet_client_disconnect_callback_del(Ecore_Con_Eet *ece, Ecore_Con_Eet_Client_Cb func, const void *data); > +EAPI void ecore_con_eet_client_disconnect_callback_add(Ecore_Con_Eet *ece, Ecore_Con_Eet_Client_Cb func, const void *data); > +EAPI void ecore_con_eet_client_disconnect_callback_del(Ecore_Con_Eet *ece, Ecore_Con_Eet_Client_Cb func, const void *data); > > -void ecore_con_eet_server_connect_callback_add(Ecore_Con_Eet *ece, Ecore_Con_Eet_Server_Cb func, const void *data); > -void ecore_con_eet_server_connect_callback_del(Ecore_Con_Eet *ece, Ecore_Con_Eet_Server_Cb func, const void *data); > +EAPI void ecore_con_eet_server_connect_callback_add(Ecore_Con_Eet *ece, Ecore_Con_Eet_Server_Cb func, const void *data); > +EAPI void ecore_con_eet_server_connect_callback_del(Ecore_Con_Eet *ece, Ecore_Con_Eet_Server_Cb func, const void *data); > > -void ecore_con_eet_server_disconnect_callback_add(Ecore_Con_Eet *ece, Ecore_Con_Eet_Server_Cb func, const void *data); > -void ecore_con_eet_server_disconnect_callback_del(Ecore_Con_Eet *ece, Ecore_Con_Eet_Server_Cb func, const void *data); > +EAPI void ecore_con_eet_server_disconnect_callback_add(Ecore_Con_Eet *ece, Ecore_Con_Eet_Server_Cb func, const void *data); > +EAPI void ecore_con_eet_server_disconnect_callback_del(Ecore_Con_Eet *ece, Ecore_Con_Eet_Server_Cb func, const void *data); > > -void ecore_con_eet_data_set(Ecore_Con_Eet *ece, const void *data); > -void *ecore_con_eet_data_get(Ecore_Con_Eet *ece); > +EAPI void ecore_con_eet_data_set(Ecore_Con_Eet *ece, const void *data); > +EAPI void *ecore_con_eet_data_get(Ecore_Con_Eet *ece); > > -Ecore_Con_Eet *ecore_con_eet_reply(Ecore_Con_Reply *reply); > -void ecore_con_eet_send(Ecore_Con_Reply *reply, const char *protocol_name, void *value); > -void ecore_con_eet_raw_send(Ecore_Con_Reply *reply, const char *protocol_name, const char *section, void *value, unsigned int length); > +EAPI Ecore_Con_Eet *ecore_con_eet_reply(Ecore_Con_Reply *reply); > +EAPI void ecore_con_eet_send(Ecore_Con_Reply *reply, const char *protocol_name, void *value); > +EAPI void ecore_con_eet_raw_send(Ecore_Con_Reply *reply, const char *protocol_name, const char *section, void *value, unsigned int length); > > #endif > > Modified: trunk/ecore/src/lib/ecore_con/ecore_con_eet.c > =================================================================== > --- trunk/ecore/src/lib/ecore_con/ecore_con_eet.c 2012-08-31 06:23:29 UTC (rev 75918) > +++ trunk/ecore/src/lib/ecore_con/ecore_con_eet.c 2012-08-31 06:39:57 UTC (rev 75919) > @@ -413,7 +413,11 @@ > return EINA_TRUE; > } > > -Ecore_Con_Eet * > +/************** > + * Global API * > + **************/ > + > +EAPI Ecore_Con_Eet * > ecore_con_eet_server_new(Ecore_Con_Server *server) > { > Ecore_Con_Eet *r; > @@ -438,7 +442,7 @@ > return r; > } > > -Ecore_Con_Eet * > +EAPI Ecore_Con_Eet * > ecore_con_eet_client_new(Ecore_Con_Server *server) > { > Ecore_Con_Eet *r; > @@ -464,7 +468,7 @@ > return r; > } > > -void > +EAPI void > ecore_con_eet_server_free(Ecore_Con_Eet *r) > { > if (!r) return ; > @@ -512,7 +516,7 @@ > free(r); > } > > -void > +EAPI void > ecore_con_eet_register(Ecore_Con_Eet *ece, const char *name, Eet_Data_Descriptor *edd) > { > if (!ece) return ; > @@ -520,7 +524,7 @@ > EET_DATA_DESCRIPTOR_ADD_MAPPING(ece->matching, name, edd); > } > > -void > +EAPI void > ecore_con_eet_data_callback_add(Ecore_Con_Eet *ece, const char *name, Ecore_Con_Eet_Data_Cb func, const void *data) > { > Ecore_Con_Eet_Data *eced; > @@ -537,14 +541,14 @@ > eina_hash_direct_add(ece->data_callbacks, eced->name, eced); > } > > -void > +EAPI void > ecore_con_eet_data_callback_del(Ecore_Con_Eet *ece, const char *name) > { > if (!ece) return ; > eina_hash_del(ece->data_callbacks, name, NULL); > } > > -void > +EAPI void > ecore_con_eet_raw_data_callback_add(Ecore_Con_Eet *ece, const char *name, Ecore_Con_Eet_Raw_Data_Cb func, const void *data) > { > Ecore_Con_Eet_Raw_Data *eced; > @@ -561,7 +565,7 @@ > eina_hash_direct_add(ece->raw_data_callbacks, eced->name, eced); > } > > -void > +EAPI void > ecore_con_eet_raw_data_callback_del(Ecore_Con_Eet *ece, const char *name) > { > if (!ece) return ; > @@ -575,7 +579,7 @@ > eina_hash_del(ece->raw_data_callbacks, name, NULL); > } > > -void > +EAPI void > ecore_con_eet_client_connect_callback_add(Ecore_Con_Eet *ece, Ecore_Con_Eet_Client_Cb func, const void *data) > { > Ecore_Con_Eet_Client *c; > @@ -591,7 +595,7 @@ > ece->u.server.client_connect_callbacks = eina_list_append(ece->u.server.client_connect_callbacks, c); > } > > -void > +EAPI void > ecore_con_eet_client_connect_callback_del(Ecore_Con_Eet *ece, Ecore_Con_Eet_Client_Cb func, const void *data) > { > Ecore_Con_Eet_Client *c; > @@ -608,7 +612,7 @@ > } > } > > -void > +EAPI void > ecore_con_eet_client_disconnect_callback_add(Ecore_Con_Eet *ece, Ecore_Con_Eet_Client_Cb func, const void *data) > { > Ecore_Con_Eet_Client *c; > @@ -624,7 +628,7 @@ > ece->u.server.client_connect_callbacks = eina_list_append(ece->u.server.client_disconnect_callbacks, c); > } > > -void > +EAPI void > ecore_con_eet_client_disconnect_callback_del(Ecore_Con_Eet *ece, Ecore_Con_Eet_Client_Cb func, const void *data) > { > Ecore_Con_Eet_Client *c; > @@ -642,7 +646,7 @@ > } > } > > -void > +EAPI void > ecore_con_eet_server_connect_callback_add(Ecore_Con_Eet *ece, Ecore_Con_Eet_Server_Cb func, const void *data) > { > Ecore_Con_Eet_Server *s; > @@ -658,7 +662,7 @@ > ece->u.client.server_connect_callbacks = eina_list_append(ece->u.client.server_connect_callbacks, s); > } > > -void > +EAPI void > ecore_con_eet_server_connect_callback_del(Ecore_Con_Eet *ece, Ecore_Con_Eet_Server_Cb func, const void *data) > { > Ecore_Con_Eet_Server *s; > @@ -675,7 +679,7 @@ > } > } > > -void > +EAPI void > ecore_con_eet_server_disconnect_callback_add(Ecore_Con_Eet *ece, Ecore_Con_Eet_Server_Cb func, const void *data) > { > Ecore_Con_Eet_Server *s; > @@ -691,7 +695,7 @@ > ece->u.client.server_disconnect_callbacks = eina_list_append(ece->u.client.server_disconnect_callbacks, s); > } > > -void > +EAPI void > ecore_con_eet_server_disconnect_callback_del(Ecore_Con_Eet *ece, Ecore_Con_Eet_Server_Cb func, const void *data) > { > Ecore_Con_Eet_Server *s; > @@ -708,7 +712,7 @@ > } > } > > -void > +EAPI void > ecore_con_eet_data_set(Ecore_Con_Eet *ece, const void *data) > { > if (!ece) return; > @@ -716,21 +720,21 @@ > ece->data = data; > } > > -void * > +EAPI void * > ecore_con_eet_data_get(Ecore_Con_Eet *ece) > { > if (!ece) return NULL; > return (void*) ece->data; > } > > -Ecore_Con_Eet * > +EAPI Ecore_Con_Eet * > ecore_con_eet_reply(Ecore_Con_Reply *reply) > { > if (!reply) return NULL; > return reply->ece; > } > > -void > +EAPI void > ecore_con_eet_send(Ecore_Con_Reply *reply, const char *name, void *value) > { > Ecore_Con_Eet_Protocol protocol; > @@ -743,7 +747,7 @@ > eet_connection_send(reply->econn, reply->ece->edd, &protocol, NULL); > } > > -void > +EAPI void > ecore_con_eet_raw_send(Ecore_Con_Reply *reply, const char *protocol_name, const char *section, void *value, unsigned int length) > { > unsigned int protocol[4]; > > > ------------------------------------------------------------------------------ > Live Security Virtual Conference > Exclusive live event will cover all the ways today's security and > threat landscape has changed and how IT managers can respond. Discussions > will include endpoint security, mobile security and the latest in malware > threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/ > _______________________________________________ > enlightenment-svn mailing list > enl...@li... > https://lists.sourceforge.net/lists/listinfo/enlightenment-svn |
From: Arnaud de T. <qu...@gm...> - 2008-10-07 11:27:47
|
On Mon, Oct 6, 2008 at 7:08 PM, Peter Wehrfritz <pet...@we...>wrote: > Enlightenment SVN schrieb: > > Log: > > Another step toward IPv6 support with more cleanup. > > > > Patch from Arnaud de Turckheim. > > > > > > Author: cedric > > Date: 2008-10-06 09:40:01 -0700 (Mon, 06 Oct 2008) > > New Revision: 36483 > > > > Modified: > > trunk/ecore/src/lib/ecore_con/ecore_con.c > trunk/ecore/src/lib/ecore_con/ecore_con_info.c > > > > Modified: trunk/ecore/src/lib/ecore_con/ecore_con.c > > =================================================================== > > --- trunk/ecore/src/lib/ecore_con/ecore_con.c 2008-10-06 15:58:21 UTC > (rev 36482) > > +++ trunk/ecore/src/lib/ecore_con/ecore_con.c 2008-10-06 16:40:01 UTC > (rev 36483) > > @@ -26,21 +26,23 @@ > > # include <winsock2.h> > > #endif > > > > -static void _ecore_con_cb_dns_lookup(void *data, struct hostent *he); > > -static void _ecore_con_cb_udp_dns_lookup(void *data, struct hostent > *he); > > static void _ecore_con_cb_tcp_connect(void *data, Ecore_Con_Netinfo > *info); > > static void _ecore_con_cb_udp_connect(void *data, Ecore_Con_Netinfo > *info); > > static void _ecore_con_cb_tcp_listen(void *data, Ecore_Con_Netinfo > *info); > > static void _ecore_con_cb_udp_listen(void *data, Ecore_Con_Netinfo > *info); > > + > > static void _ecore_con_server_free(Ecore_Con_Server *svr); > > static void _ecore_con_client_free(Ecore_Con_Client *cl); > > + > > static int _ecore_con_svr_handler(void *data, Ecore_Fd_Handler > *fd_handler); > > static int _ecore_con_cl_handler(void *data, Ecore_Fd_Handler > *fd_handler); > > static int _ecore_con_cl_udp_handler(void *data, Ecore_Fd_Handler > *fd_handler); > > static int _ecore_con_svr_udp_handler(void *data, Ecore_Fd_Handler > *fd_handler); > > static int _ecore_con_svr_cl_handler(void *data, Ecore_Fd_Handler > *fd_handler); > > + > > static void _ecore_con_server_flush(Ecore_Con_Server *svr); > > static void _ecore_con_client_flush(Ecore_Con_Client *cl); > > + > > static void _ecore_con_event_client_add_free(void *data, void *ev); > > static void _ecore_con_event_client_del_free(void *data, void *ev); > > static void _ecore_con_event_client_data_free(void *data, void *ev); > > @@ -57,8 +59,25 @@ > > > > static Ecore_List *servers = NULL; > > static int init_count = 0; > > + > > #if USE_OPENSSL > > static int ssl_init_count = 0; > > +static int _ecore_con_init_ssl(Ecore_Con_Server *svr); > > +static int _ecore_con_shutdown_ssl(Ecore_Con_Server *svr); > > +static int _ecore_con_free_ssl(Ecore_Con_Server *svr); > > + > > +# define INIT_SSL(svr) _ecore_con_init_ssl(svr) > > +# define SHUTDOWN_SSL(svr) _ecore_con_shutdown_ssl(svr) > > +# define FREE_SSL(svr) _ecore_con_free_ssl(svr) > > +# define UNSET_SSL(svr) \ > > + do { \ > > + svr->ssl = NULL; \ > > + svr->ssl_ctx = NULL; \ > > + } while (0); > > > > The point of using do {} while(0) in macros, fades away if you append a > semicolon. I'll remove the semicolon, sorry about that. > > > +#else > > +# define INIT_SSL(svr) 0 > > +# define SHUTDOWN_SSL(svr) 0 > > +# define FREE_SSL(svr) 0 > > #endi > I haven't read the full code, but I think you are missing the > UNSET_SSL() for the !OPENSSL case. We don't need UNSET_SSL() to be define when !USE_OPENSSL. INIT_SSL, SHUTDOWN_SSL and FREE_SSL have to be define to 0 because these macros are used in if tests. > > > Peter > > ------------------------------------------------------------------------- > This SF.Net email is sponsored by the Moblin Your Move Developer's > challenge > Build the coolest Linux based applications with Moblin SDK & win great > prizes > Grand prize is a trip for two to an Open Source event anywhere in the world > http://moblin-contest.org/redirect.php?banner_id=100&url=/ > _______________________________________________ > enlightenment-devel mailing list > enl...@li... > https://lists.sourceforge.net/lists/listinfo/enlightenment-devel > -- Arnaud de Turckheim |
From: Arnaud de T. <qu...@gm...> - 2008-10-07 12:59:35
|
On Tue, Oct 7, 2008 at 1:24 PM, Arnaud de Turckheim <qu...@gm...>wrote: > On Mon, Oct 6, 2008 at 7:08 PM, Peter Wehrfritz <pet...@we...>wrote: > >> Enlightenment SVN schrieb: >> > Log: >> > Another step toward IPv6 support with more cleanup. >> > >> > Patch from Arnaud de Turckheim. >> > >> > >> > Author: cedric >> > Date: 2008-10-06 09:40:01 -0700 (Mon, 06 Oct 2008) >> > New Revision: 36483 >> > >> > Modified: >> > trunk/ecore/src/lib/ecore_con/ecore_con.c >> trunk/ecore/src/lib/ecore_con/ecore_con_info.c >> > >> > Modified: trunk/ecore/src/lib/ecore_con/ecore_con.c >> > =================================================================== >> > --- trunk/ecore/src/lib/ecore_con/ecore_con.c 2008-10-06 15:58:21 UTC >> (rev 36482) >> > +++ trunk/ecore/src/lib/ecore_con/ecore_con.c 2008-10-06 16:40:01 UTC >> (rev 36483) >> > @@ -26,21 +26,23 @@ >> > # include <winsock2.h> >> > #endif >> > >> > -static void _ecore_con_cb_dns_lookup(void *data, struct hostent *he); >> > -static void _ecore_con_cb_udp_dns_lookup(void *data, struct hostent >> *he); >> > static void _ecore_con_cb_tcp_connect(void *data, Ecore_Con_Netinfo >> *info); >> > static void _ecore_con_cb_udp_connect(void *data, Ecore_Con_Netinfo >> *info); >> > static void _ecore_con_cb_tcp_listen(void *data, Ecore_Con_Netinfo >> *info); >> > static void _ecore_con_cb_udp_listen(void *data, Ecore_Con_Netinfo >> *info); >> > + >> > static void _ecore_con_server_free(Ecore_Con_Server *svr); >> > static void _ecore_con_client_free(Ecore_Con_Client *cl); >> > + >> > static int _ecore_con_svr_handler(void *data, Ecore_Fd_Handler >> *fd_handler); >> > static int _ecore_con_cl_handler(void *data, Ecore_Fd_Handler >> *fd_handler); >> > static int _ecore_con_cl_udp_handler(void *data, Ecore_Fd_Handler >> *fd_handler); >> > static int _ecore_con_svr_udp_handler(void *data, Ecore_Fd_Handler >> *fd_handler); >> > static int _ecore_con_svr_cl_handler(void *data, Ecore_Fd_Handler >> *fd_handler); >> > + >> > static void _ecore_con_server_flush(Ecore_Con_Server *svr); >> > static void _ecore_con_client_flush(Ecore_Con_Client *cl); >> > + >> > static void _ecore_con_event_client_add_free(void *data, void *ev); >> > static void _ecore_con_event_client_del_free(void *data, void *ev); >> > static void _ecore_con_event_client_data_free(void *data, void *ev); >> > @@ -57,8 +59,25 @@ >> > >> > static Ecore_List *servers = NULL; >> > static int init_count = 0; >> > + >> > #if USE_OPENSSL >> > static int ssl_init_count = 0; >> > +static int _ecore_con_init_ssl(Ecore_Con_Server *svr); >> > +static int _ecore_con_shutdown_ssl(Ecore_Con_Server *svr); >> > +static int _ecore_con_free_ssl(Ecore_Con_Server *svr); >> > + >> > +# define INIT_SSL(svr) _ecore_con_init_ssl(svr) >> > +# define SHUTDOWN_SSL(svr) _ecore_con_shutdown_ssl(svr) >> > +# define FREE_SSL(svr) _ecore_con_free_ssl(svr) >> > +# define UNSET_SSL(svr) \ >> > + do { \ >> > + svr->ssl = NULL; \ >> > + svr->ssl_ctx = NULL; \ >> > + } while (0); >> > >> >> The point of using do {} while(0) in macros, fades away if you append a >> semicolon. > > I'll remove the semicolon, sorry about that. > >> >> > +#else >> > +# define INIT_SSL(svr) 0 >> > +# define SHUTDOWN_SSL(svr) 0 >> > +# define FREE_SSL(svr) 0 >> > #endi >> I haven't read the full code, but I think you are missing the >> UNSET_SSL() for the !OPENSSL case. > > We don't need UNSET_SSL() to be define when !USE_OPENSSL. > INIT_SSL, SHUTDOWN_SSL and FREE_SSL have to be define to 0 because these > macros are used in if tests. > Hmmm... Sorry we definitively need to define UNSET_SSL()... > > >> >> Peter >> >> ------------------------------------------------------------------------- >> This SF.Net email is sponsored by the Moblin Your Move Developer's >> challenge >> Build the coolest Linux based applications with Moblin SDK & win great >> prizes >> Grand prize is a trip for two to an Open Source event anywhere in the >> world >> http://moblin-contest.org/redirect.php?banner_id=100&url=/ >> _______________________________________________ >> enlightenment-devel mailing list >> enl...@li... >> https://lists.sourceforge.net/lists/listinfo/enlightenment-devel >> > > > > -- > Arnaud de Turckheim > -- Arnaud de Turckheim |
From: Peter W. <pet...@we...> - 2008-10-07 14:12:53
|
Arnaud de Turckheim schrieb: > On Tue, Oct 7, 2008 at 1:24 PM, Arnaud de Turckheim <qu...@gm...>wrote: > > >> On Mon, Oct 6, 2008 at 7:08 PM, Peter Wehrfritz <pet...@we...>wrote: >> >> >>> Enlightenment SVN schrieb: >>> >>>> + >>>> +# define INIT_SSL(svr) _ecore_con_init_ssl(svr) >>>> +# define SHUTDOWN_SSL(svr) _ecore_con_shutdown_ssl(svr) >>>> +# define FREE_SSL(svr) _ecore_con_free_ssl(svr) >>>> +# define UNSET_SSL(svr) \ >>>> + do { \ >>>> + svr->ssl = NULL; \ >>>> + svr->ssl_ctx = NULL; \ >>>> + } while (0); >>>> >>>> >>> The point of using do {} while(0) in macros, fades away if you append a >>> semicolon. >>> >> I'll remove the semicolon, sorry about that. >> No problem. >> >>>> +#else >>>> +# define INIT_SSL(svr) 0 >>>> +# define SHUTDOWN_SSL(svr) 0 >>>> +# define FREE_SSL(svr) 0 >>>> #endi >>>> >>> I haven't read the full code, but I think you are missing the >>> UNSET_SSL() for the !OPENSSL case. >>> >> We don't need UNSET_SSL() to be define when !USE_OPENSSL. >> INIT_SSL, SHUTDOWN_SSL and FREE_SSL have to be define to 0 because these >> macros are used in if tests. >> >> > Hmmm... Sorry we definitively need to define UNSET_SSL()... > Yeah, I wasn't sure either, else I probably fixed it myself. Peter |