Enlightenment CVS committal
Author : sebastid
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore_con
Modified Files:
ecore_con.c
Log Message:
Fix init and shutdown.
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_con/ecore_con.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -3 -r1.51 -r1.52
--- ecore_con.c 7 Sep 2005 08:59:45 -0000 1.51
+++ ecore_con.c 7 Sep 2005 09:06:06 -0000 1.52
@@ -63,26 +63,25 @@
int
ecore_con_init(void)
{
- init_count++;
- if (!ECORE_CON_EVENT_CLIENT_ADD)
- {
- ECORE_CON_EVENT_CLIENT_ADD = ecore_event_type_new();
- ECORE_CON_EVENT_CLIENT_DEL = ecore_event_type_new();
- ECORE_CON_EVENT_SERVER_ADD = ecore_event_type_new();
- ECORE_CON_EVENT_SERVER_DEL = ecore_event_type_new();
- ECORE_CON_EVENT_CLIENT_DATA = ecore_event_type_new();
- ECORE_CON_EVENT_SERVER_DATA = ecore_event_type_new();
+ if (++init_count != 1) return init_count;
+
+ ECORE_CON_EVENT_CLIENT_ADD = ecore_event_type_new();
+ ECORE_CON_EVENT_CLIENT_DEL = ecore_event_type_new();
+ ECORE_CON_EVENT_SERVER_ADD = ecore_event_type_new();
+ ECORE_CON_EVENT_SERVER_DEL = ecore_event_type_new();
+ ECORE_CON_EVENT_CLIENT_DATA = ecore_event_type_new();
+ ECORE_CON_EVENT_SERVER_DATA = ecore_event_type_new();
#if USE_OPENSSL
- SSL_library_init();
- SSL_load_error_strings();
+ SSL_library_init();
+ SSL_load_error_strings();
#endif
- /* TODO Remember return value, if it fails, use gethostbyname() */
- ecore_con_dns_init();
- }
- if (!servers)
- servers = ecore_list_new();
+ /* TODO Remember return value, if it fails, use gethostbyname() */
+ ecore_con_dns_init();
+
+ servers = ecore_list_new();
+
return init_count;
}
@@ -95,18 +94,16 @@
int
ecore_con_shutdown(void)
{
- if (init_count > 0)
- {
- init_count--;
- if (init_count > 0) return init_count;
- while (!ecore_list_is_empty(servers))
- _ecore_con_server_free(ecore_list_remove_first(servers));
- ecore_list_destroy(servers);
- servers = NULL;
+ if (--init_count != 0) return init_count;
- ecore_con_dns_shutdown();
- }
- return 0;
+ while (!ecore_list_is_empty(servers))
+ _ecore_con_server_free(ecore_list_remove_first(servers));
+ ecore_list_destroy(servers);
+ servers = NULL;
+
+ ecore_con_dns_shutdown();
+
+ return init_count;
}
/**
-------------------------------------------------------
SF.Net email is Sponsored by the Better Software Conference & EXPO
September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices
Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA
Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
