Enlightenment CVS committal
Author : englebass
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore_file
Modified Files:
Makefile.am ecore_file_monitor.c ecore_file_private.h
Removed Files:
ecore_file_monitor_fam.c
Log Message:
remove fam support, will never be fixed and inotify is the shit.
===================================================================
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_file/Makefile.am,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- Makefile.am 4 Nov 2007 09:29:18 -0000 1.12
+++ Makefile.am 5 Nov 2007 18:57:11 -0000 1.13
@@ -14,7 +14,6 @@
ecore_file.c \
ecore_file_private.h \
ecore_file_monitor.c \
-ecore_file_monitor_fam.c \
ecore_file_monitor_inotify.c \
ecore_file_monitor_poll.c \
ecore_file_path.c \
@@ -22,7 +21,7 @@
libecore_file_la_LIBADD = \
$(top_builddir)/src/lib/ecore/libecore.la \
[EMAIL PROTECTED]@ @CURL_LIBS@ @ecore_file_win32_lib@ @winsock_libs@
[EMAIL PROTECTED]@ @ecore_file_win32_lib@ @winsock_libs@
libecore_file_la_LDFLAGS = @create_shared_lib@ -version-info @version_info@
@@ -32,7 +31,6 @@
ecore_file.c \
ecore_file_private.h \
ecore_file_monitor.c \
-ecore_file_monitor_fam.c \
ecore_file_monitor_inotify.c \
ecore_file_monitor_poll.c \
ecore_file_path.c
===================================================================
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_file/ecore_file_monitor.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- ecore_file_monitor.c 6 Aug 2007 20:00:28 -0000 1.8
+++ ecore_file_monitor.c 5 Nov 2007 18:57:11 -0000 1.9
@@ -10,9 +10,6 @@
#ifdef HAVE_INOTIFY
ECORE_FILE_MONITOR_TYPE_INOTIFY,
#endif
-#ifdef HAVE_FAM
- ECORE_FILE_MONITOR_TYPE_FAM,
-#endif
#ifdef HAVE_POLL
ECORE_FILE_MONITOR_TYPE_POLL
#endif
@@ -30,13 +27,6 @@
if (ecore_file_monitor_inotify_init())
return init;
#endif
-#ifdef HAVE_FAM
-#if 0
- monitor_type = ECORE_FILE_MONITOR_TYPE_FAM;
- if (ecore_file_monitor_fam_init())
- return init;
-#endif
-#endif
#ifdef HAVE_POLL
monitor_type = ECORE_FILE_MONITOR_TYPE_POLL;
if (ecore_file_monitor_poll_init())
@@ -60,11 +50,6 @@
ecore_file_monitor_inotify_shutdown();
break;
#endif
-#ifdef HAVE_FAM
- case ECORE_FILE_MONITOR_TYPE_FAM:
- ecore_file_monitor_fam_shutdown();
- break;
-#endif
#ifdef HAVE_POLL
case ECORE_FILE_MONITOR_TYPE_POLL:
ecore_file_monitor_poll_shutdown();
@@ -75,7 +60,7 @@
}
/**
- * Monitor a path using inotify, fam or polling
+ * Monitor a path using inotify or polling
* @param path The path to monitor
* @param func The function to call on changes
* @param data The data passed to func
@@ -96,10 +81,6 @@
case ECORE_FILE_MONITOR_TYPE_INOTIFY:
return ecore_file_monitor_inotify_add(path, func, data);
#endif
-#ifdef HAVE_FAM
- case ECORE_FILE_MONITOR_TYPE_FAM:
- return ecore_file_monitor_fam_add(path, func, data);
-#endif
#ifdef HAVE_POLL
case ECORE_FILE_MONITOR_TYPE_POLL:
return ecore_file_monitor_poll_add(path, func, data);
@@ -122,11 +103,6 @@
#ifdef HAVE_INOTIFY
case ECORE_FILE_MONITOR_TYPE_INOTIFY:
ecore_file_monitor_inotify_del(em);
- break;
-#endif
-#ifdef HAVE_FAM
- case ECORE_FILE_MONITOR_TYPE_FAM:
- ecore_file_monitor_fam_del(em);
break;
#endif
#ifdef HAVE_POLL
===================================================================
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_file/ecore_file_private.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -3 -r1.18 -r1.19
--- ecore_file_private.h 29 Oct 2007 20:02:08 -0000 1.18
+++ ecore_file_private.h 5 Nov 2007 18:57:11 -0000 1.19
@@ -40,18 +40,6 @@
void ecore_file_monitor_inotify_del(Ecore_File_Monitor
*ecore_file_monitor);
#endif
-#ifdef HAVE_FAM
-int ecore_file_monitor_fam_init(void);
-int ecore_file_monitor_fam_shutdown(void);
-Ecore_File_Monitor *ecore_file_monitor_fam_add(const char *path,
- void (*func) (void *data,
-
Ecore_File_Monitor *ecore_file_monitor,
-
Ecore_File_Event event,
- const char
*path),
- void *data);
-void ecore_file_monitor_fam_del(Ecore_File_Monitor
*ecore_file_monitor);
-#endif
-
#ifdef HAVE_POLL
int ecore_file_monitor_poll_init(void);
int ecore_file_monitor_poll_shutdown(void);
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
