Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore
Modified Files:
Ecore_Data.h ecore_anim.c ecore_events.c ecore_hash.c
ecore_main.c ecore_private.h ecore_signal.c ecore_value.c
Log Message:
kwo's ecore cleanup patch
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore/Ecore_Data.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- Ecore_Data.h 29 Jan 2005 02:13:11 -0000 1.11
+++ Ecore_Data.h 2 Mar 2005 07:06:32 -0000 1.12
@@ -219,6 +219,7 @@
/* Removing items from the list */
void *ecore_dlist_remove(Ecore_DList * _e_dlist);
void *ecore_dlist_remove_first(Ecore_DList * _e_dlist);
+ int ecore_dlist_remove_destroy(Ecore_DList *list);
void *ecore_dlist_remove_last(Ecore_DList * _e_dlist);
/* Traversing the list */
@@ -240,6 +241,7 @@
int ecore_dlist_clear(Ecore_DList * _e_dlist);
/* Creating and initializing list nodes */
+ int ecore_dlist_node_init(Ecore_DList_Node * node);
Ecore_DList_Node *ecore_dlist_node_new(void);
/* Destroying nodes */
@@ -307,7 +309,7 @@
void ecore_hash_dump_graph(Ecore_Hash *hash);
- inline void ecore_print_warning(const char *function, char *sparam);
+ inline void ecore_print_warning(const char *function, const char *sparam);
/* Wrappers around free() that helps debug free() bugs such as freeing NULL
* or accessing a pointer that has already been freed */
@@ -457,6 +459,8 @@
void *ecore_sheap_extract(Ecore_Sheap *heap);
void *ecore_sheap_extreme(Ecore_Sheap *heap);
int ecore_sheap_change(Ecore_Sheap *heap, void *item, void *newval);
+ int ecore_sheap_set_compare(Ecore_Sheap *heap, Ecore_Compare_Cb compare);
+ void ecore_sheap_set_order(Ecore_Sheap *heap, char order);
void ecore_sheap_destroy(Ecore_Sheap *heap);
void ecore_sheap_sort(Ecore_Sheap *heap);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore/ecore_anim.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- ecore_anim.c 11 Nov 2004 12:24:00 -0000 1.2
+++ ecore_anim.c 2 Mar 2005 07:06:32 -0000 1.3
@@ -122,7 +122,7 @@
}
static int
-_ecore_animator(void *data)
+_ecore_animator(void *data __UNUSED__)
{
Ecore_Oldlist *l;
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore/ecore_events.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- ecore_events.c 14 Jan 2005 04:50:06 -0000 1.14
+++ ecore_events.c 2 Mar 2005 07:06:32 -0000 1.15
@@ -79,7 +79,7 @@
return event_handler->data;
}
-static void _ecore_event_generic_free (void *data, void *event)
+static void _ecore_event_generic_free (void *data __UNUSED__, void *event)
{
free (event);
}
@@ -433,7 +433,7 @@
}
void
-_ecore_event_exe_exit_free(void *data, void *ev)
+_ecore_event_exe_exit_free(void *data __UNUSED__, void *ev)
{
Ecore_Event_Exe_Exit *e;
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore/ecore_hash.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- ecore_hash.c 5 Jan 2005 07:20:11 -0000 1.10
+++ ecore_hash.c 2 Mar 2005 07:06:32 -0000 1.11
@@ -169,7 +169,7 @@
*/
void ecore_hash_destroy(Ecore_Hash *hash)
{
- int i = 0;
+ unsigned int i = 0;
CHECK_PARAM_POINTER("hash", hash);
@@ -209,7 +209,7 @@
int ecore_hash_for_each_node(Ecore_Hash *hash, Ecore_For_Each for_each_func,
void *user_data)
{
- int i = 0;
+ unsigned int i = 0;
CHECK_PARAM_POINTER_RETURN("hash", hash, FALSE);
CHECK_PARAM_POINTER_RETURN("for_each_func", for_each_func, FALSE);
@@ -241,7 +241,7 @@
*/
Ecore_List *ecore_hash_keys(Ecore_Hash *hash)
{
- int i = 0;
+ unsigned int i = 0;
Ecore_List *keys;
CHECK_PARAM_POINTER_RETURN("hash", hash, NULL);
@@ -274,7 +274,7 @@
void
ecore_hash_dump_graph(Ecore_Hash *hash)
{
- int i;
+ unsigned int i;
for (i = 0; i < ecore_prime_table[hash->size]; i++)
if (hash->buckets[i])
@@ -620,7 +620,7 @@
inline int
_ecore_hash_rehash(Ecore_Hash *hash, Ecore_List **old_table, int old_size)
{
- int i;
+ unsigned int i;
Ecore_Hash_Node *node;
Ecore_List *old;
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore/ecore_main.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- ecore_main.c 8 Nov 2004 00:08:25 -0000 1.15
+++ ecore_main.c 2 Mar 2005 07:06:33 -0000 1.16
@@ -421,7 +421,7 @@
_ecore_main_loop_iterate_internal(int once_only)
{
double next_time;
- int have_event;
+ int have_event = 0;
int have_signal;
in_main_loop++;
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore/ecore_private.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- ecore_private.h 8 Feb 2005 12:26:40 -0000 1.11
+++ ecore_private.h 2 Mar 2005 07:06:33 -0000 1.12
@@ -18,6 +18,12 @@
#include <config.h>
#endif
+#if HAVE___ATTRIBUTE__
+#define __UNUSED__ __attribute__((unused))
+#else
+#define __UNUSED__
+#endif
+
#define ECORE_MAGIC_NONE 0x1234fedc
#define ECORE_MAGIC_EXE 0xf7e812f5
#define ECORE_MAGIC_TIMER 0xf7d713f4
@@ -36,7 +42,7 @@
#define ECORE_MAGIC_CHECK(d, m) ((d) && ((d)->__magic == (m)))
#define ECORE_MAGIC_FAIL(d, m, fn) _ecore_magic_fail((d), (d) ? (d)->__magic
: 0, (m), (fn));
-typedef int Ecore_Magic;
+typedef unsigned int Ecore_Magic;
typedef struct _Ecore_Oldlist Ecore_Oldlist;
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore/ecore_signal.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- ecore_signal.c 9 Feb 2005 02:18:02 -0000 1.15
+++ ecore_signal.c 2 Mar 2005 07:06:33 -0000 1.16
@@ -42,13 +42,13 @@
static volatile sig_atomic_t sigint_count = 0;
static volatile sig_atomic_t sigterm_count = 0;
-static volatile siginfo_t sigchld_info = {0};
-static volatile siginfo_t sigusr1_info = {0};
-static volatile siginfo_t sigusr2_info = {0};
-static volatile siginfo_t sighup_info = {0};
-static volatile siginfo_t sigquit_info = {0};
-static volatile siginfo_t sigint_info = {0};
-static volatile siginfo_t sigterm_info = {0};
+static volatile siginfo_t sigchld_info;
+static volatile siginfo_t sigusr1_info;
+static volatile siginfo_t sigusr2_info;
+static volatile siginfo_t sighup_info;
+static volatile siginfo_t sigquit_info;
+static volatile siginfo_t sigint_info;
+static volatile siginfo_t sigterm_info;
#ifdef SIGPWR
static volatile sig_atomic_t sigpwr_count = 0;
@@ -337,12 +337,12 @@
}
static void
-_ecore_signal_callback_ignore(int sig, siginfo_t *si, void *foo)
+_ecore_signal_callback_ignore(int sig __UNUSED__, siginfo_t *si __UNUSED__,
void *foo __UNUSED__)
{
}
static void
-_ecore_signal_callback_sigchld(int sig, siginfo_t *si, void *foo)
+_ecore_signal_callback_sigchld(int sig __UNUSED__, siginfo_t *si, void *foo
__UNUSED__)
{
if (si)
sigchld_info = *si;
@@ -354,7 +354,7 @@
}
static void
-_ecore_signal_callback_sigusr1(int sig, siginfo_t *si, void *foo)
+_ecore_signal_callback_sigusr1(int sig __UNUSED__, siginfo_t *si, void *foo
__UNUSED__)
{
if (si)
sigusr1_info = *si;
@@ -366,7 +366,7 @@
}
static void
-_ecore_signal_callback_sigusr2(int sig, siginfo_t *si, void *foo)
+_ecore_signal_callback_sigusr2(int sig __UNUSED__, siginfo_t *si, void *foo
__UNUSED__)
{
if (si)
sigusr2_info = *si;
@@ -378,7 +378,7 @@
}
static void
-_ecore_signal_callback_sighup(int sig, siginfo_t *si, void *foo)
+_ecore_signal_callback_sighup(int sig __UNUSED__, siginfo_t *si, void *foo
__UNUSED__)
{
if (si)
sighup_info = *si;
@@ -390,7 +390,7 @@
}
static void
-_ecore_signal_callback_sigquit(int sig, siginfo_t *si, void *foo)
+_ecore_signal_callback_sigquit(int sig __UNUSED__, siginfo_t *si, void *foo
__UNUSED__)
{
if (si)
sigquit_info = *si;
@@ -402,7 +402,7 @@
}
static void
-_ecore_signal_callback_sigint(int sig, siginfo_t *si, void *foo)
+_ecore_signal_callback_sigint(int sig __UNUSED__, siginfo_t *si, void *foo
__UNUSED__)
{
if (si)
sigint_info = *si;
@@ -414,7 +414,7 @@
}
static void
-_ecore_signal_callback_sigterm(int sig, siginfo_t *si, void *foo)
+_ecore_signal_callback_sigterm(int sig __UNUSED__, siginfo_t *si, void *foo
__UNUSED__)
{
if (si)
sigterm_info = *si;
@@ -427,7 +427,7 @@
#ifdef SIGPWR
static void
-_ecore_signal_callback_sigpwr(int sig, siginfo_t *si, void *foo)
+_ecore_signal_callback_sigpwr(int sig __UNUSED__, siginfo_t *si, void *foo
__UNUSED__)
{
if (si)
sigpwr_info = *si;
@@ -441,7 +441,7 @@
#ifdef SIGRTMIN
static void
-_ecore_signal_callback_sigrt(int sig, siginfo_t *si, void *foo)
+_ecore_signal_callback_sigrt(int sig, siginfo_t *si, void *foo __UNUSED__)
{
if (si)
sigrt_info[sig - SIGRTMIN] = *si;
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore/ecore_value.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- ecore_value.c 8 Dec 2004 16:23:09 -0000 1.4
+++ ecore_value.c 2 Mar 2005 07:06:33 -0000 1.5
@@ -31,7 +31,7 @@
2097143, 4194301, 8388617, 16777213
};
-inline void ecore_print_warning(const char *function, char *sparam)
+inline void ecore_print_warning(const char *function, const char *sparam)
{
fprintf(stderr, "***** Developer Warning ***** :\n"
"\tThis program is calling:\n\n"
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
