Enlightenment CVS committal
Author : sebastid
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore_file
Modified Files:
ecore_file_monitor_fam.c ecore_file_monitor_inotify.c
ecore_file_monitor_poll.c ecore_file_private.h
Log Message:
Move Ecore_Oldlist to Ecore_List2 and rename the funcs from _list_
to _list2_
===================================================================
RCS file:
/cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_file/ecore_file_monitor_fam.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- ecore_file_monitor_fam.c 20 Apr 2005 09:20:33 -0000 1.4
+++ ecore_file_monitor_fam.c 30 Aug 2005 10:05:27 -0000 1.5
@@ -27,13 +27,13 @@
struct _Ecore_File
{
- Ecore_Oldlist __list_data;
+ Ecore_List2 __list_data;
char *name;
};
static Ecore_Fd_Handler *_fdh = NULL;
static FAMConnection *_fc = NULL;
-static Ecore_Oldlist *_monitors = NULL;
+static Ecore_List2 *_monitors = NULL;
static int _ecore_file_monitor_fam_handler(void *data,
Ecore_Fd_Handler *fdh);
static Ecore_File *_ecore_file_monitor_fam_file_find(Ecore_File_Monitor
*em, char *name);
@@ -55,7 +55,7 @@
int
ecore_file_monitor_fam_shutdown(void)
{
- Ecore_Oldlist *l;
+ Ecore_List2 *l;
for (l = _monitors; l;)
{
@@ -119,7 +119,7 @@
return NULL;
}
- _monitors = _ecore_list_append(_monitors, em);
+ _monitors = _ecore_list2_append(_monitors, em);
return em;
}
@@ -127,7 +127,7 @@
void
ecore_file_monitor_fam_del(Ecore_File_Monitor *em)
{
- Ecore_Oldlist *l;
+ Ecore_List2 *l;
for (l = em->files; l; l = l->next)
{
@@ -138,7 +138,7 @@
free(f);
}
- _monitors = _ecore_list_remove(_monitors, em);
+ _monitors = _ecore_list2_remove(_monitors, em);
if (ECORE_FILE_MONITOR_FAM(em)->request)
{
===================================================================
RCS file:
/cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_file/ecore_file_monitor_inotify.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- ecore_file_monitor_inotify.c 29 Aug 2005 15:15:59 -0000 1.7
+++ ecore_file_monitor_inotify.c 30 Aug 2005 10:05:27 -0000 1.8
@@ -27,7 +27,7 @@
};
static Ecore_Fd_Handler *_fdh = NULL;
-static Ecore_Oldlist *_monitors = NULL;
+static Ecore_List2 *_monitors = NULL;
static int _ecore_file_monitor_inotify_handler(void *data,
Ecore_Fd_Handler *fdh);
static Ecore_File_Monitor *_ecore_file_monitor_inotify_monitor_find(int wd);
@@ -62,7 +62,7 @@
ecore_file_monitor_inotify_shutdown(void)
{
int fd;
- Ecore_Oldlist *l;
+ Ecore_List2 *l;
for (l = _monitors; l;)
{
@@ -126,7 +126,7 @@
return NULL;
}
- _monitors = _ecore_list_append(_monitors, em);
+ _monitors = _ecore_list2_append(_monitors, em);
return em;
}
@@ -136,7 +136,7 @@
{
int fd;
- _monitors = _ecore_list_remove(_monitors, em);
+ _monitors = _ecore_list2_remove(_monitors, em);
fd = ecore_main_fd_handler_fd_get(_fdh);
if (ECORE_FILE_MONITOR_INOTIFY(em)->wd)
@@ -174,7 +174,7 @@
static Ecore_File_Monitor *
_ecore_file_monitor_inotify_monitor_find(int wd)
{
- Ecore_Oldlist *l;
+ Ecore_List2 *l;
for (l = _monitors; l; l = l->next)
{
===================================================================
RCS file:
/cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_file/ecore_file_monitor_poll.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- ecore_file_monitor_poll.c 27 Aug 2005 04:34:56 -0000 1.12
+++ ecore_file_monitor_poll.c 30 Aug 2005 10:05:27 -0000 1.13
@@ -28,7 +28,7 @@
struct _Ecore_File
{
- Ecore_Oldlist __list_data;
+ Ecore_List2 __list_data;
char *name;
int mtime;
unsigned char is_dir;
@@ -40,7 +40,7 @@
static double _interval = ECORE_FILE_INTERVAL_MIN;
static Ecore_Timer *_timer = NULL;
-static Ecore_Oldlist *_monitors = NULL;
+static Ecore_List2 *_monitors = NULL;
static int _lock = 0;
static int _ecore_file_monitor_poll_handler(void *data);
@@ -56,7 +56,7 @@
int
ecore_file_monitor_poll_shutdown(void)
{
- Ecore_Oldlist *l;
+ Ecore_List2 *l;
for (l = _monitors; l;)
{
@@ -132,7 +132,7 @@
f->name = file;
f->mtime = ecore_file_mod_time(buf);
f->is_dir = ecore_file_is_dir(buf);
- em->files = _ecore_list_append(em->files, f);
+ em->files = _ecore_list2_append(em->files, f);
}
ecore_list_destroy(files);
}
@@ -144,7 +144,7 @@
return NULL;
}
- _monitors = _ecore_list_append(_monitors, em);
+ _monitors = _ecore_list2_append(_monitors, em);
return em;
}
@@ -152,7 +152,7 @@
void
ecore_file_monitor_poll_del(Ecore_File_Monitor *em)
{
- Ecore_Oldlist *l;
+ Ecore_List2 *l;
if (_lock)
{
@@ -174,7 +174,7 @@
}
}
- _monitors = _ecore_list_remove(_monitors, em);
+ _monitors = _ecore_list2_remove(_monitors, em);
free(em->path);
free(em);
@@ -191,7 +191,7 @@
static int
_ecore_file_monitor_poll_handler(void *data __UNUSED__)
{
- Ecore_Oldlist *l;
+ Ecore_List2 *l;
_interval += ECORE_FILE_INTERVAL_STEP;
@@ -231,7 +231,7 @@
is_dir = ecore_file_is_dir(em->path);
if (mtime < ECORE_FILE_MONITOR_POLL(em)->mtime)
{
- Ecore_Oldlist *l;
+ Ecore_List2 *l;
Ecore_File_Event event;
/* Notify all files deleted */
@@ -258,7 +258,7 @@
}
else
{
- Ecore_Oldlist *l;
+ Ecore_List2 *l;
/* Check for changed files */
for (l = em->files; l;)
@@ -281,7 +281,7 @@
event = ECORE_FILE_EVENT_DELETED_FILE;
em->func(em->data, em, event, buf);
- em->files = _ecore_list_remove(em->files, f);
+ em->files = _ecore_list2_remove(em->files, f);
free(f->name);
free(f);
_interval = ECORE_FILE_INTERVAL_MIN;
@@ -333,7 +333,7 @@
else
event = ECORE_FILE_EVENT_CREATED_FILE;
em->func(em->data, em, event, buf);
- em->files = _ecore_list_append(em->files, f);
+ em->files = _ecore_list2_append(em->files, f);
}
ecore_list_destroy(files);
}
@@ -349,7 +349,7 @@
static int
_ecore_file_monitor_poll_checking(Ecore_File_Monitor *em, char *name)
{
- Ecore_Oldlist *l;
+ Ecore_List2 *l;
for (l = em->files; l; l = l->next)
{
===================================================================
RCS file:
/cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_file/ecore_file_private.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- ecore_file_private.h 17 Jun 2005 23:52:32 -0000 1.7
+++ ecore_file_private.h 30 Aug 2005 10:05:27 -0000 1.8
@@ -18,7 +18,7 @@
struct _Ecore_File_Monitor
{
- Ecore_Oldlist __list_data;
+ Ecore_List2 __list_data;
void (*func) (void *data,
Ecore_File_Monitor *ecore_file_monitor,
Ecore_File_Event event,
@@ -26,7 +26,7 @@
char *path;
void *data;
- Ecore_Oldlist *files;
+ Ecore_List2 *files;
};
#ifdef HAVE_INOTIFY
-------------------------------------------------------
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
