Enlightenment CVS committal
Author : sebastid
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore_file
Modified Files:
ecore_file.c ecore_file_download.c ecore_file_monitor.c
ecore_file_path.c
Log Message:
Only run init when count is 1 and shutdown when count is 0
===================================================================
RCS file:
/cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_file/ecore_file.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- ecore_file.c 7 Sep 2005 08:50:25 -0000 1.13
+++ ecore_file.c 7 Sep 2005 08:57:08 -0000 1.14
@@ -9,7 +9,7 @@
int
ecore_file_init()
{
- if (++init > 1) return init;
+ if (++init != 1) return init;
if (!ecore_file_monitor_init())
goto error;
@@ -31,7 +31,7 @@
int
ecore_file_shutdown()
{
- if (--init > 0) return init;
+ if (--init != 0) return init;
ecore_file_monitor_shutdown();
ecore_file_path_shutdown();
===================================================================
RCS file:
/cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_file/ecore_file_download.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- ecore_file_download.c 7 Sep 2005 08:50:25 -0000 1.6
+++ ecore_file_download.c 7 Sep 2005 08:57:08 -0000 1.7
@@ -33,7 +33,7 @@
int
ecore_file_download_init(void)
{
- if (++init > 1) return init;
+ if (++init != 1) return init;
#ifdef HAVE_CURL
FD_ZERO(&_current_fd_set);
@@ -56,7 +56,7 @@
int
ecore_file_download_shutdown(void)
{
- if (--init > 0) return init;
+ if (--init != 0) return init;
#ifdef HAVE_CURL
Ecore_File_Download_Job *job;
===================================================================
RCS file:
/cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_file/ecore_file_monitor.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- ecore_file_monitor.c 7 Sep 2005 08:50:25 -0000 1.5
+++ ecore_file_monitor.c 7 Sep 2005 08:57:08 -0000 1.6
@@ -23,7 +23,7 @@
int
ecore_file_monitor_init(void)
{
- if (++init > 1) return init;
+ if (++init != 1) return init;
#ifdef HAVE_INOTIFY
monitor_type = ECORE_FILE_MONITOR_TYPE_INOTIFY;
@@ -49,7 +49,7 @@
int
ecore_file_monitor_shutdown(void)
{
- if (--init > 0) return init;
+ if (--init != 0) return init;
switch (monitor_type)
{
===================================================================
RCS file:
/cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_file/ecore_file_path.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- ecore_file_path.c 7 Sep 2005 08:50:25 -0000 1.3
+++ ecore_file_path.c 7 Sep 2005 08:57:08 -0000 1.4
@@ -11,7 +11,7 @@
int
ecore_file_path_init(void)
{
- if (++init > 1) return init;
+ if (++init != 1) return init;
__ecore_file_path_bin = _ecore_file_path_from_env("PATH");
return init;
}
@@ -19,7 +19,7 @@
int
ecore_file_path_shutdown(void)
{
- if (--init > 0) return init;
+ if (--init != 0) return init;
ecore_list_destroy(__ecore_file_path_bin);
return init;
}
-------------------------------------------------------
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
