Enlightenment CVS committal
Author : sebastid
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore
Modified Files:
ecore_anim.c ecore_events.c ecore_exe.c ecore_idle_enterer.c
ecore_idle_exiter.c ecore_idler.c ecore_list.c ecore_main.c
ecore_private.h ecore_timer.c
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/ecore_anim.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- ecore_anim.c 2 Mar 2005 07:06:32 -0000 1.3
+++ ecore_anim.c 30 Aug 2005 10:05:25 -0000 1.4
@@ -36,7 +36,7 @@
ECORE_MAGIC_SET(animator, ECORE_MAGIC_ANIMATOR);
animator->func = func;
animator->data = (void *)data;
- animators = _ecore_list_append(animators, animator);
+ animators = _ecore_list2_append(animators, animator);
if (!timer)
timer = ecore_timer_add(animators_frametime, _ecore_animator, NULL);
return animator;
@@ -115,7 +115,7 @@
Ecore_Animator *animator;
animator = animators;
- animators = _ecore_list_remove(animators, animator);
+ animators = _ecore_list2_remove(animators, animator);
ECORE_MAGIC_SET(animator, ECORE_MAGIC_NONE);
free(animator);
}
@@ -124,9 +124,9 @@
static int
_ecore_animator(void *data __UNUSED__)
{
- Ecore_Oldlist *l;
+ Ecore_List2 *l;
- for (l = (Ecore_Oldlist *)animators; l;)
+ for (l = (Ecore_List2 *)animators; l;)
{
Ecore_Animator *animator;
@@ -144,7 +144,7 @@
if (animators_delete_me)
{
- for (l = (Ecore_Oldlist *)animators; l;)
+ for (l = (Ecore_List2 *)animators; l;)
{
Ecore_Animator *animator;
@@ -152,7 +152,7 @@
l = l->next;
if (animator->delete_me)
{
- animators = _ecore_list_remove(animators, animator);
+ animators = _ecore_list2_remove(animators, animator);
ECORE_MAGIC_SET(animator, ECORE_MAGIC_NONE);
free(animator);
animators_delete_me--;
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore/ecore_events.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -3 -r1.18 -r1.19
--- ecore_events.c 13 Jun 2005 02:30:37 -0000 1.18
+++ ecore_events.c 30 Aug 2005 10:05:26 -0000 1.19
@@ -7,7 +7,7 @@
static Ecore_Event_Handler **event_handlers = NULL;
static int event_handlers_num = 0;
static int event_handlers_alloc_num = 0;
-static Ecore_Oldlist_Data *event_handlers_delete_list = NULL;
+static Ecore_List2_Data *event_handlers_delete_list = NULL;
static Ecore_Event_Filter *event_filters = NULL;
static int event_filters_delete_me = 0;
@@ -76,7 +76,7 @@
event_handlers[i] = NULL;
}
}
- event_handlers[type] = _ecore_list_append(event_handlers[type], eh);
+ event_handlers[type] = _ecore_list2_append(event_handlers[type], eh);
return eh;
}
@@ -93,7 +93,7 @@
void *
ecore_event_handler_del(Ecore_Event_Handler *event_handler)
{
- Ecore_Oldlist_Data *node;
+ Ecore_List2_Data *node;
if (!ECORE_MAGIC_CHECK(event_handler, ECORE_MAGIC_EVENT_HANDLER))
{
@@ -102,9 +102,9 @@
return NULL;
}
event_handler->delete_me = 1;
- node = calloc(1, sizeof(Ecore_Oldlist_Data));
+ node = calloc(1, sizeof(Ecore_List2_Data));
node->data = event_handler;
- event_handlers_delete_list = _ecore_list_append(event_handlers_delete_list,
node);
+ event_handlers_delete_list =
_ecore_list2_append(event_handlers_delete_list, node);
return event_handler->data;
}
@@ -215,7 +215,7 @@
ef->func_filter = func_filter;
ef->func_end = func_end;
ef->data = (void *)data;
- event_filters = _ecore_list_append(event_filters, ef);
+ event_filters = _ecore_list2_append(event_filters, ef);
return ef;
}
@@ -295,17 +295,17 @@
Ecore_Event_Handler *eh;
eh = event_handlers[i];
- event_handlers[i] = _ecore_list_remove(event_handlers[i], eh);
+ event_handlers[i] = _ecore_list2_remove(event_handlers[i], eh);
ECORE_MAGIC_SET(eh, ECORE_MAGIC_NONE);
free(eh);
}
}
while (event_handlers_delete_list)
{
- Ecore_Oldlist_Data *ehd;
+ Ecore_List2_Data *ehd;
ehd = event_handlers_delete_list;
- event_handlers_delete_list =
_ecore_list_remove(event_handlers_delete_list, ehd);
+ event_handlers_delete_list =
_ecore_list2_remove(event_handlers_delete_list, ehd);
free(ehd);
}
if (event_handlers) free(event_handlers);
@@ -317,7 +317,7 @@
Ecore_Event_Filter *ef;
ef = event_filters;
- event_filters = _ecore_list_remove(event_filters, ef);
+ event_filters = _ecore_list2_remove(event_filters, ef);
ECORE_MAGIC_SET(ef, ECORE_MAGIC_NONE);
free(ef);
}
@@ -343,7 +343,7 @@
e->event = ev;
e->func_free = func_free;
e->data = data;
- events = _ecore_list_append(events, e);
+ events = _ecore_list2_append(events, e);
events_num++;
return e;
}
@@ -355,7 +355,7 @@
data = event->data;
event->func_free(event->data, event->event);
- events = _ecore_list_remove(events, event);
+ events = _ecore_list2_remove(events, event);
ECORE_MAGIC_SET(event, ECORE_MAGIC_NONE);
free(event);
events_num--;
@@ -365,21 +365,21 @@
void
_ecore_event_call(void)
{
- Ecore_Oldlist *l, *ll;
+ Ecore_List2 *l, *ll;
Ecore_Event *e;
Ecore_Event_Filter *ef;
Ecore_Event_Handler *eh;
- Ecore_Oldlist_Data *ehd;
+ Ecore_List2_Data *ehd;
int handle_count;
- for (l = (Ecore_Oldlist *)event_filters; l; l = l->next)
+ for (l = (Ecore_List2 *)event_filters; l; l = l->next)
{
ef = (Ecore_Event_Filter *)l;
if (!ef->delete_me)
{
if (ef->func_start)
ef->loop_data = ef->func_start(ef->data);
- for (ll = (Ecore_Oldlist *)events; ll; ll = ll->next)
+ for (ll = (Ecore_List2 *)events; ll; ll = ll->next)
{
Ecore_Event *e;
@@ -397,13 +397,13 @@
}
if (event_filters_delete_me)
{
- for (l = (Ecore_Oldlist *)event_filters; l;)
+ for (l = (Ecore_List2 *)event_filters; l;)
{
ef = (Ecore_Event_Filter *)l;
l = l->next;
if (ef->delete_me)
{
- event_filters = _ecore_list_remove(event_filters, ef);
+ event_filters = _ecore_list2_remove(event_filters, ef);
ECORE_MAGIC_SET(ef, ECORE_MAGIC_NONE);
free(ef);
}
@@ -411,7 +411,7 @@
event_filters_delete_me = 0;
}
// printf("EVENT BATCH...\n");
- for (l = (Ecore_Oldlist *)events; l; l = l->next)
+ for (l = (Ecore_List2 *)events; l; l = l->next)
{
e = (Ecore_Event *)l;
if (!e->delete_me)
@@ -422,7 +422,7 @@
// printf("HANDLE ev type %i, %p\n", e->type, e->event);
if ((e->type >= 0) && (e->type < event_handlers_num))
{
- for (ll = (Ecore_Oldlist *)event_handlers[e->type]; ll; ll =
ll->next)
+ for (ll = (Ecore_List2 *)event_handlers[e->type]; ll; ll =
ll->next)
{
eh = (Ecore_Event_Handler *)ll;
if (!eh->delete_me)
@@ -447,8 +447,8 @@
{
ehd = event_handlers_delete_list;
eh = ehd->data;
- event_handlers[eh->type] = _ecore_list_remove(event_handlers[eh->type],
eh);
- event_handlers_delete_list =
_ecore_list_remove(event_handlers_delete_list, ehd);
+ event_handlers[eh->type] =
_ecore_list2_remove(event_handlers[eh->type], eh);
+ event_handlers_delete_list =
_ecore_list2_remove(event_handlers_delete_list, ehd);
ECORE_MAGIC_SET(eh, ECORE_MAGIC_NONE);
free(eh);
free(ehd);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore/ecore_exe.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- ecore_exe.c 7 Jul 2005 03:31:34 -0000 1.8
+++ ecore_exe.c 30 Aug 2005 10:05:26 -0000 1.9
@@ -47,7 +47,7 @@
ECORE_MAGIC_SET(exe, ECORE_MAGIC_EXE);
exe->pid = pid;
exe->data = (void *)data;
- exes = _ecore_list_append(exes, exe);
+ exes = _ecore_list2_append(exes, exe);
return exe;
}
setsid();
@@ -237,9 +237,9 @@
Ecore_Exe *
_ecore_exe_find(pid_t pid)
{
- Ecore_Oldlist *l;
+ Ecore_List2 *l;
- for (l = (Ecore_Oldlist *)exes; l; l = l->next)
+ for (l = (Ecore_List2 *)exes; l; l = l->next)
{
Ecore_Exe *exe;
@@ -255,7 +255,7 @@
void *data;
data = exe->data;
- exes = _ecore_list_remove(exes, exe);
+ exes = _ecore_list2_remove(exes, exe);
ECORE_MAGIC_SET(exe, ECORE_MAGIC_NONE);
free(exe);
return data;
===================================================================
RCS file:
/cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore/ecore_idle_enterer.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- ecore_idle_enterer.c 8 May 2004 04:44:03 -0000 1.5
+++ ecore_idle_enterer.c 30 Aug 2005 10:05:26 -0000 1.6
@@ -23,7 +23,7 @@
ECORE_MAGIC_SET(ie, ECORE_MAGIC_IDLE_ENTERER);
ie->func = func;
ie->data = (void *)data;
- idle_enterers = _ecore_list_append(idle_enterers, ie);
+ idle_enterers = _ecore_list2_append(idle_enterers, ie);
return ie;
}
@@ -56,7 +56,7 @@
Ecore_Idle_Enterer *ie;
ie = idle_enterers;
- idle_enterers = _ecore_list_remove(idle_enterers, ie);
+ idle_enterers = _ecore_list2_remove(idle_enterers, ie);
ECORE_MAGIC_SET(ie, ECORE_MAGIC_NONE);
free(ie);
}
@@ -66,9 +66,9 @@
void
_ecore_idle_enterer_call(void)
{
- Ecore_Oldlist *l;
+ Ecore_List2 *l;
- for (l = (Ecore_Oldlist *)idle_enterers; l; l = l->next)
+ for (l = (Ecore_List2 *)idle_enterers; l; l = l->next)
{
Ecore_Idle_Enterer *ie;
@@ -80,7 +80,7 @@
}
if (idle_enterers_delete_me)
{
- for (l = (Ecore_Oldlist *)idle_enterers; l;)
+ for (l = (Ecore_List2 *)idle_enterers; l;)
{
Ecore_Idle_Enterer *ie;
@@ -88,7 +88,7 @@
l = l->next;
if (ie->delete_me)
{
- idle_enterers = _ecore_list_remove(idle_enterers, ie);
+ idle_enterers = _ecore_list2_remove(idle_enterers, ie);
ECORE_MAGIC_SET(ie, ECORE_MAGIC_NONE);
free(ie);
}
===================================================================
RCS file:
/cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore/ecore_idle_exiter.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- ecore_idle_exiter.c 8 May 2004 04:44:03 -0000 1.3
+++ ecore_idle_exiter.c 30 Aug 2005 10:05:26 -0000 1.4
@@ -22,7 +22,7 @@
ECORE_MAGIC_SET(ie, ECORE_MAGIC_IDLE_EXITER);
ie->func = func;
ie->data = (void *)data;
- idle_exiters = _ecore_list_append(idle_exiters, ie);
+ idle_exiters = _ecore_list2_append(idle_exiters, ie);
return ie;
}
@@ -55,7 +55,7 @@
Ecore_Idle_Exiter *ie;
ie = idle_exiters;
- idle_exiters = _ecore_list_remove(idle_exiters, ie);
+ idle_exiters = _ecore_list2_remove(idle_exiters, ie);
ECORE_MAGIC_SET(ie, ECORE_MAGIC_NONE);
free(ie);
}
@@ -65,9 +65,9 @@
void
_ecore_idle_exiter_call(void)
{
- Ecore_Oldlist *l;
+ Ecore_List2 *l;
- for (l = (Ecore_Oldlist *)idle_exiters; l; l = l->next)
+ for (l = (Ecore_List2 *)idle_exiters; l; l = l->next)
{
Ecore_Idle_Exiter *ie;
@@ -79,7 +79,7 @@
}
if (idle_exiters_delete_me)
{
- for (l = (Ecore_Oldlist *)idle_exiters; l;)
+ for (l = (Ecore_List2 *)idle_exiters; l;)
{
Ecore_Idle_Exiter *ie;
@@ -87,7 +87,7 @@
l = l->next;
if (ie->delete_me)
{
- idle_exiters = _ecore_list_remove(idle_exiters, ie);
+ idle_exiters = _ecore_list2_remove(idle_exiters, ie);
ECORE_MAGIC_SET(ie, ECORE_MAGIC_NONE);
free(ie);
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore/ecore_idler.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- ecore_idler.c 8 May 2004 04:44:03 -0000 1.5
+++ ecore_idler.c 30 Aug 2005 10:05:26 -0000 1.6
@@ -22,7 +22,7 @@
ECORE_MAGIC_SET(ie, ECORE_MAGIC_IDLER);
ie->func = func;
ie->data = (void *)data;
- idlers = _ecore_list_append(idlers, ie);
+ idlers = _ecore_list2_append(idlers, ie);
return ie;
}
@@ -55,7 +55,7 @@
Ecore_Idler *ie;
ie = idlers;
- idlers = _ecore_list_remove(idlers, ie);
+ idlers = _ecore_list2_remove(idlers, ie);
ECORE_MAGIC_SET(ie, ECORE_MAGIC_NONE);
free(ie);
}
@@ -65,9 +65,9 @@
int
_ecore_idler_call(void)
{
- Ecore_Oldlist *l;
+ Ecore_List2 *l;
- for (l = (Ecore_Oldlist *)idlers; l; l = l->next)
+ for (l = (Ecore_List2 *)idlers; l; l = l->next)
{
Ecore_Idler *ie;
@@ -79,7 +79,7 @@
}
if (idlers_delete_me)
{
- for (l = (Ecore_Oldlist *)idlers; l;)
+ for (l = (Ecore_List2 *)idlers; l;)
{
Ecore_Idler *ie;
@@ -87,7 +87,7 @@
l = l->next;
if (ie->delete_me)
{
- idlers = _ecore_list_remove(idlers, ie);
+ idlers = _ecore_list2_remove(idlers, ie);
ECORE_MAGIC_SET(ie, ECORE_MAGIC_NONE);
free(ie);
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore/ecore_list.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- ecore_list.c 21 Jul 2005 18:47:04 -0000 1.16
+++ ecore_list.c 30 Aug 2005 10:05:26 -0000 1.17
@@ -32,10 +32,10 @@
/* XXX: Begin deprecated code */
void *
-_ecore_list_append(void *in_list, void *in_item)
+_ecore_list2_append(void *in_list, void *in_item)
{
- Ecore_Oldlist *l, *new_l;
- Ecore_Oldlist *list, *item;
+ Ecore_List2 *l, *new_l;
+ Ecore_List2 *list, *item;
list = in_list;
item = in_item;
@@ -56,10 +56,10 @@
}
void *
-_ecore_list_prepend(void *in_list, void *in_item)
+_ecore_list2_prepend(void *in_list, void *in_item)
{
- Ecore_Oldlist *new_l;
- Ecore_Oldlist *list, *item;
+ Ecore_List2 *new_l;
+ Ecore_List2 *list, *item;
list = in_list;
item = in_item;
@@ -79,10 +79,10 @@
}
void *
-_ecore_list_append_relative(void *in_list, void *in_item, void *in_relative)
+_ecore_list2_append_relative(void *in_list, void *in_item, void *in_relative)
{
- Ecore_Oldlist *l;
- Ecore_Oldlist *list, *item, *relative;
+ Ecore_List2 *l;
+ Ecore_List2 *list, *item, *relative;
list = in_list;
item = in_item;
@@ -91,7 +91,7 @@
{
if (l == relative)
{
- Ecore_Oldlist *new_l;
+ Ecore_List2 *new_l;
new_l = item;
if (l->next)
@@ -108,14 +108,14 @@
return list;
}
}
- return _ecore_list_append(list, item);
+ return _ecore_list2_append(list, item);
}
void *
-_ecore_list_prepend_relative(void *in_list, void *in_item, void *in_relative)
+_ecore_list2_prepend_relative(void *in_list, void *in_item, void *in_relative)
{
- Ecore_Oldlist *l;
- Ecore_Oldlist *list, *item, *relative;
+ Ecore_List2 *l;
+ Ecore_List2 *list, *item, *relative;
list = in_list;
item = in_item;
@@ -124,7 +124,7 @@
{
if (l == relative)
{
- Ecore_Oldlist *new_l;
+ Ecore_List2 *new_l;
new_l = item;
new_l->prev = l->prev;
@@ -150,14 +150,14 @@
}
}
}
- return _ecore_list_prepend(list, item);
+ return _ecore_list2_prepend(list, item);
}
void *
-_ecore_list_remove(void *in_list, void *in_item)
+_ecore_list2_remove(void *in_list, void *in_item)
{
- Ecore_Oldlist *return_l;
- Ecore_Oldlist *list, *item;
+ Ecore_List2 *return_l;
+ Ecore_List2 *list, *item;
/* checkme */
if(!in_list)
@@ -187,10 +187,10 @@
}
void *
-_ecore_list_find(void *in_list, void *in_item)
+_ecore_list2_find(void *in_list, void *in_item)
{
- Ecore_Oldlist *l;
- Ecore_Oldlist *list, *item;
+ Ecore_List2 *l;
+ Ecore_List2 *list, *item;
list = in_list;
item = in_item;
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore/ecore_main.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -3 -r1.18 -r1.19
--- ecore_main.c 28 Mar 2005 09:00:08 -0000 1.18
+++ ecore_main.c 30 Aug 2005 10:05:26 -0000 1.19
@@ -140,7 +140,7 @@
fdh->data = (void *)data;
fdh->buf_func = buf_func;
fdh->buf_data = (void *)buf_data;
- fd_handlers = _ecore_list_append(fd_handlers, fdh);
+ fd_handlers = _ecore_list2_append(fd_handlers, fdh);
return fdh;
}
@@ -257,7 +257,7 @@
Ecore_Fd_Handler *fdh;
fdh = fd_handlers;
- fd_handlers = _ecore_list_remove(fd_handlers, fdh);
+ fd_handlers = _ecore_list2_remove(fd_handlers, fdh);
ECORE_MAGIC_SET(fdh, ECORE_MAGIC_NONE);
free(fdh);
}
@@ -271,7 +271,7 @@
fd_set rfds, wfds, exfds;
int max_fd;
int ret;
- Ecore_Oldlist *l;
+ Ecore_List2 *l;
t = NULL;
if (timeout > 0.0)
@@ -302,7 +302,7 @@
FD_ZERO(&exfds);
/* call the prepare callback for all handlers */
- for (l = (Ecore_Oldlist *)fd_handlers; l; l = l->next)
+ for (l = (Ecore_List2 *)fd_handlers; l; l = l->next)
{
Ecore_Fd_Handler *fdh;
@@ -311,7 +311,7 @@
if (fdh->prep_func)
fdh->prep_func (fdh->prep_data, fdh);
}
- for (l = (Ecore_Oldlist *)fd_handlers; l; l = l->next)
+ for (l = (Ecore_List2 *)fd_handlers; l; l = l->next)
{
Ecore_Fd_Handler *fdh;
@@ -342,7 +342,7 @@
}
if (ret > 0)
{
- for (l = (Ecore_Oldlist *)fd_handlers; l; l = l->next)
+ for (l = (Ecore_List2 *)fd_handlers; l; l = l->next)
{
Ecore_Fd_Handler *fdh;
@@ -366,10 +366,10 @@
static void
_ecore_main_fd_handlers_cleanup(void)
{
- Ecore_Oldlist *l;
+ Ecore_List2 *l;
if (!fd_handlers_delete_me) return;
- for (l = (Ecore_Oldlist *)fd_handlers; l;)
+ for (l = (Ecore_List2 *)fd_handlers; l;)
{
Ecore_Fd_Handler *fdh;
@@ -377,7 +377,7 @@
l = l->next;
if (fdh->delete_me)
{
- fd_handlers = _ecore_list_remove(fd_handlers, fdh);
+ fd_handlers = _ecore_list2_remove(fd_handlers, fdh);
ECORE_MAGIC_SET(fdh, ECORE_MAGIC_NONE);
free(fdh);
}
@@ -388,9 +388,9 @@
static void
_ecore_main_fd_handlers_call(void)
{
- Ecore_Oldlist *l;
+ Ecore_List2 *l;
- for (l = (Ecore_Oldlist *)fd_handlers; l; l = l->next)
+ for (l = (Ecore_List2 *)fd_handlers; l; l = l->next)
{
Ecore_Fd_Handler *fdh;
@@ -417,11 +417,11 @@
static int
_ecore_main_fd_handlers_buf_call(void)
{
- Ecore_Oldlist *l;
+ Ecore_List2 *l;
int ret;
ret = 0;
- for (l = (Ecore_Oldlist *)fd_handlers; l; l = l->next)
+ for (l = (Ecore_List2 *)fd_handlers; l; l = l->next)
{
Ecore_Fd_Handler *fdh;
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore/ecore_private.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- ecore_private.h 28 May 2005 03:57:17 -0000 1.14
+++ ecore_private.h 30 Aug 2005 10:05:26 -0000 1.15
@@ -44,18 +44,18 @@
typedef unsigned int Ecore_Magic;
-typedef struct _Ecore_Oldlist Ecore_Oldlist;
-typedef struct _Ecore_Oldlist_Data Ecore_Oldlist_Data;
+typedef struct _Ecore_List2 Ecore_List2;
+typedef struct _Ecore_List2_Data Ecore_List2_Data;
-struct _Ecore_Oldlist
+struct _Ecore_List2
{
- Ecore_Oldlist *next, *prev;
- Ecore_Oldlist *last;
+ Ecore_List2 *next, *prev;
+ Ecore_List2 *last;
};
-struct _Ecore_Oldlist_Data
+struct _Ecore_List2_Data
{
- Ecore_Oldlist __list_data;
+ Ecore_List2 __list_data;
void *data;
};
@@ -84,7 +84,7 @@
#ifndef WIN32
struct _Ecore_Exe
{
- Ecore_Oldlist __list_data;
+ Ecore_List2 __list_data;
ECORE_MAGIC;
pid_t pid;
void *data;
@@ -93,7 +93,7 @@
struct _Ecore_Timer
{
- Ecore_Oldlist __list_data;
+ Ecore_List2 __list_data;
ECORE_MAGIC;
double in;
double at;
@@ -105,7 +105,7 @@
struct _Ecore_Idler
{
- Ecore_Oldlist __list_data;
+ Ecore_List2 __list_data;
ECORE_MAGIC;
int delete_me : 1;
int (*func) (void *data);
@@ -114,7 +114,7 @@
struct _Ecore_Idle_Enterer
{
- Ecore_Oldlist __list_data;
+ Ecore_List2 __list_data;
ECORE_MAGIC;
int delete_me : 1;
int (*func) (void *data);
@@ -123,7 +123,7 @@
struct _Ecore_Idle_Exiter
{
- Ecore_Oldlist __list_data;
+ Ecore_List2 __list_data;
ECORE_MAGIC;
int delete_me : 1;
int (*func) (void *data);
@@ -132,7 +132,7 @@
struct _Ecore_Fd_Handler
{
- Ecore_Oldlist __list_data;
+ Ecore_List2 __list_data;
ECORE_MAGIC;
int fd;
Ecore_Fd_Handler_Flags flags;
@@ -150,7 +150,7 @@
struct _Ecore_Event_Handler
{
- Ecore_Oldlist __list_data;
+ Ecore_List2 __list_data;
ECORE_MAGIC;
int type;
int delete_me : 1;
@@ -160,7 +160,7 @@
struct _Ecore_Event_Filter
{
- Ecore_Oldlist __list_data;
+ Ecore_List2 __list_data;
ECORE_MAGIC;
int delete_me : 1;
void * (*func_start) (void *data);
@@ -172,7 +172,7 @@
struct _Ecore_Event
{
- Ecore_Oldlist __list_data;
+ Ecore_List2 __list_data;
ECORE_MAGIC;
int type;
void *event;
@@ -183,7 +183,7 @@
struct _Ecore_Animator
{
- Ecore_Oldlist __list_data;
+ Ecore_List2 __list_data;
ECORE_MAGIC;
signed char delete_me : 1;
int (*func) (void *data);
@@ -244,12 +244,12 @@
void _ecore_animator_shutdown(void);
-void *_ecore_list_append (void *in_list, void *in_item);
-void *_ecore_list_prepend (void *in_list, void *in_item);
-void *_ecore_list_append_relative (void *in_list, void *in_item, void
*in_relative);
-void *_ecore_list_prepend_relative (void *in_list, void *in_item, void
*in_relative);
-void *_ecore_list_remove (void *in_list, void *in_item);
-void *_ecore_list_find (void *in_list, void *in_item);
+void *_ecore_list2_append (void *in_list, void *in_item);
+void *_ecore_list2_prepend (void *in_list, void *in_item);
+void *_ecore_list2_append_relative (void *in_list, void *in_item,
void *in_relative);
+void *_ecore_list2_prepend_relative (void *in_list, void *in_item,
void *in_relative);
+void *_ecore_list2_remove (void *in_list, void *in_item);
+void *_ecore_list2_find (void *in_list, void *in_item);
void _ecore_fps_debug_init(void);
void _ecore_fps_debug_shutdown(void);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore/ecore_timer.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- ecore_timer.c 4 Apr 2005 16:01:39 -0000 1.12
+++ ecore_timer.c 30 Aug 2005 10:05:26 -0000 1.13
@@ -90,7 +90,7 @@
Ecore_Timer *timer;
timer = timers;
- timers = _ecore_list_remove(timers, timer);
+ timers = _ecore_list2_remove(timers, timer);
ECORE_MAGIC_SET(timer, ECORE_MAGIC_NONE);
free(timer);
}
@@ -99,10 +99,10 @@
void
_ecore_timer_cleanup(void)
{
- Ecore_Oldlist *l;
+ Ecore_List2 *l;
if (!timers_delete_me) return;
- for (l = (Ecore_Oldlist *)timers; l;)
+ for (l = (Ecore_List2 *)timers; l;)
{
Ecore_Timer *timer;
@@ -110,7 +110,7 @@
l = l->next;
if (timer->delete_me)
{
- timers = _ecore_list_remove(timers, timer);
+ timers = _ecore_list2_remove(timers, timer);
ECORE_MAGIC_SET(timer, ECORE_MAGIC_NONE);
free(timer);
timers_delete_me--;
@@ -123,11 +123,11 @@
void
_ecore_timer_enable_new(void)
{
- Ecore_Oldlist *l;
+ Ecore_List2 *l;
if (!timers_added) return;
timers_added = 0;
- for (l = (Ecore_Oldlist *)timers; l; l = l->next)
+ for (l = (Ecore_List2 *)timers; l; l = l->next)
{
Ecore_Timer *timer;
@@ -152,28 +152,28 @@
int
_ecore_timer_call(double when)
{
- Ecore_Oldlist *l;
+ Ecore_List2 *l;
Ecore_Timer *timer;
if (!timers) return 0;
if (last_check > when)
{
/* User set time backwards */
- for (l = (Ecore_Oldlist *)timers; l; l = l->next)
+ for (l = (Ecore_List2 *)timers; l; l = l->next)
{
timer = (Ecore_Timer *)l;
timer->at -= (last_check - when);
}
}
last_check = when;
- for (l = (Ecore_Oldlist *)timers; l; l = l->next)
+ for (l = (Ecore_List2 *)timers; l; l = l->next)
{
timer = (Ecore_Timer *)l;
if ((timer->at <= when) &&
(!timer->just_added) &&
(!timer->delete_me))
{
- timers = _ecore_list_remove(timers, timer);
+ timers = _ecore_list2_remove(timers, timer);
_ecore_timer_call(when);
if ((!timer->delete_me) && (timer->func(timer->data)))
{
@@ -197,7 +197,7 @@
static void
_ecore_timer_set(Ecore_Timer *timer, double at, double in, int (*func) (void
*data), void *data)
{
- Ecore_Oldlist *l;
+ Ecore_List2 *l;
timers_added = 1;
timer->at = at;
@@ -207,17 +207,17 @@
timer->just_added = 1;
if (timers)
{
- for (l = ((Ecore_Oldlist *)(timers))->last; l; l = l->prev)
+ for (l = ((Ecore_List2 *)(timers))->last; l; l = l->prev)
{
Ecore_Timer *t2;
t2 = (Ecore_Timer *)l;
if (timer->at > t2->at)
{
- timers = _ecore_list_append_relative(timers, timer, t2);
+ timers = _ecore_list2_append_relative(timers, timer, t2);
return;
}
}
}
- timers = _ecore_list_prepend(timers, timer);
+ timers = _ecore_list2_prepend(timers, timer);
}
-------------------------------------------------------
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
