Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore
Modified Files:
Tag: SPLIT
ecore.c ecore_events.c ecore_exe.c ecore_idle_enterer.c
ecore_idler.c ecore_private.h ecore_timer.c
Log Message:
and BITCH if the programms does bad stuff (tm).
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore/Attic/ecore.c,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -3 -r1.1.2.3 -r1.1.2.4
--- ecore.c 24 Jan 2003 15:36:24 -0000 1.1.2.3
+++ ecore.c 25 Jan 2003 02:17:02 -0000 1.1.2.4
@@ -27,9 +27,11 @@
}
void
-_ecore_magic_fail(void *d, Ecore_Magic m, Ecore_Magic req_m)
+_ecore_magic_fail(void *d, Ecore_Magic m, Ecore_Magic req_m, const char *fname)
{
- fprintf(stderr, "*** ECORE ERROR: Ecore Magic Check Failed!!!\n");
+ fprintf(stderr,
+ "*** ECORE ERROR: Ecore Magic Check Failed!!!\n"
+ "*** IN FUNCTION: %s()\n", fname);
if (!d)
fprintf(stderr, " Input handle pointer is NULL!\n");
else if (m == ECORE_MAGIC_NONE)
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore/Attic/ecore_events.c,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -3 -r1.1.2.4 -r1.1.2.5
--- ecore_events.c 23 Jan 2003 23:51:41 -0000 1.1.2.4
+++ ecore_events.c 25 Jan 2003 02:17:02 -0000 1.1.2.5
@@ -45,7 +45,12 @@
void *
ecore_event_handler_del(Ecore_Event_Handler *event_handler)
{
- if (!ECORE_MAGIC_CHECK(event_handler, ECORE_MAGIC_EVENT_HANDLER)) return NULL;
+ if (!ECORE_MAGIC_CHECK(event_handler, ECORE_MAGIC_EVENT_HANDLER))
+ {
+ ECORE_MAGIC_FAIL(event_handler, ECORE_MAGIC_EVENT_HANDLER,
+ "ecore_event_handler_del");
+ return NULL;
+ }
event_handler->delete_me = 1;
event_handlers_delete_me = 1;
return event_handler->data;
@@ -81,7 +86,12 @@
void *
ecore_event_del(Ecore_Event *event)
{
- if (!ECORE_MAGIC_CHECK(event, ECORE_MAGIC_EVENT)) return NULL;
+ if (!ECORE_MAGIC_CHECK(event, ECORE_MAGIC_EVENT))
+ {
+ ECORE_MAGIC_FAIL(event, ECORE_MAGIC_EVENT,
+ "ecore_event_del");
+ return NULL;
+ }
event->delete_me = 1;
return event->data;
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore/Attic/ecore_exe.c,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -3 -r1.1.2.4 -r1.1.2.5
--- ecore_exe.c 23 Jan 2003 23:51:41 -0000 1.1.2.4
+++ ecore_exe.c 25 Jan 2003 02:17:02 -0000 1.1.2.5
@@ -62,7 +62,12 @@
void *
ecore_exe_free(Ecore_Exe *exe)
{
- if (!ECORE_MAGIC_CHECK(exe, ECORE_MAGIC_EXE)) return NULL;
+ if (!ECORE_MAGIC_CHECK(exe, ECORE_MAGIC_EXE))
+ {
+ ECORE_MAGIC_FAIL(exe, ECORE_MAGIC_EXE,
+ "ecore_exe_free");
+ return NULL;
+ }
return _ecore_exe_free(exe);
}
@@ -76,7 +81,12 @@
pid_t
ecore_exe_pid_get(Ecore_Exe *exe)
{
- if (!ECORE_MAGIC_CHECK(exe, ECORE_MAGIC_EXE)) return -1;
+ if (!ECORE_MAGIC_CHECK(exe, ECORE_MAGIC_EXE))
+ {
+ ECORE_MAGIC_FAIL(exe, ECORE_MAGIC_EXE,
+ "ecore_exe_pid_get");
+ return -1;
+ }
return exe->pid;
}
@@ -91,7 +101,12 @@
void *
ecore_exe_data_get(Ecore_Exe *exe)
{
- if (!ECORE_MAGIC_CHECK(exe, ECORE_MAGIC_EXE)) return NULL;
+ if (!ECORE_MAGIC_CHECK(exe, ECORE_MAGIC_EXE))
+ {
+ ECORE_MAGIC_FAIL(exe, ECORE_MAGIC_EXE,
+ "ecore_exe_data_get");
+ return NULL;
+ }
return exe->data;
}
@@ -104,7 +119,12 @@
void
ecore_exe_pause(Ecore_Exe *exe)
{
- if (!ECORE_MAGIC_CHECK(exe, ECORE_MAGIC_EXE)) return;
+ if (!ECORE_MAGIC_CHECK(exe, ECORE_MAGIC_EXE))
+ {
+ ECORE_MAGIC_FAIL(exe, ECORE_MAGIC_EXE,
+ "ecore_exe_pause");
+ return;
+ }
kill(exe->pid, SIGSTOP);
}
@@ -117,7 +137,12 @@
void
ecore_exe_continue(Ecore_Exe *exe)
{
- if (!ECORE_MAGIC_CHECK(exe, ECORE_MAGIC_EXE)) return;
+ if (!ECORE_MAGIC_CHECK(exe, ECORE_MAGIC_EXE))
+ {
+ ECORE_MAGIC_FAIL(exe, ECORE_MAGIC_EXE,
+ "ecore_exe_continue");
+ return;
+ }
kill(exe->pid, SIGCONT);
}
@@ -130,7 +155,12 @@
void
ecore_exe_terminate(Ecore_Exe *exe)
{
- if (!ECORE_MAGIC_CHECK(exe, ECORE_MAGIC_EXE)) return;
+ if (!ECORE_MAGIC_CHECK(exe, ECORE_MAGIC_EXE))
+ {
+ ECORE_MAGIC_FAIL(exe, ECORE_MAGIC_EXE,
+ "ecore_exe_terminate");
+ return;
+ }
kill(exe->pid, SIGTERM);
}
@@ -143,7 +173,12 @@
void
ecore_exe_kill(Ecore_Exe *exe)
{
- if (!ECORE_MAGIC_CHECK(exe, ECORE_MAGIC_EXE)) return;
+ if (!ECORE_MAGIC_CHECK(exe, ECORE_MAGIC_EXE))
+ {
+ ECORE_MAGIC_FAIL(exe, ECORE_MAGIC_EXE,
+ "ecore_exe_kill");
+ return;
+ }
kill(exe->pid, SIGKILL);
}
@@ -156,7 +191,12 @@
void
ecore_exe_signal(Ecore_Exe *exe, int num)
{
- if (!ECORE_MAGIC_CHECK(exe, ECORE_MAGIC_EXE)) return;
+ if (!ECORE_MAGIC_CHECK(exe, ECORE_MAGIC_EXE))
+ {
+ ECORE_MAGIC_FAIL(exe, ECORE_MAGIC_EXE,
+ "ecore_exe_signal");
+ return;
+ }
if (num == 1)
kill(exe->pid, SIGUSR1);
else if (num == 2)
@@ -172,7 +212,12 @@
void
ecore_exe_hup(Ecore_Exe *exe)
{
- if (!ECORE_MAGIC_CHECK(exe, ECORE_MAGIC_EXE)) return;
+ if (!ECORE_MAGIC_CHECK(exe, ECORE_MAGIC_EXE))
+ {
+ ECORE_MAGIC_FAIL(exe, ECORE_MAGIC_EXE,
+ "ecore_exe_hup");
+ return;
+ }
kill(exe->pid, SIGHUP);
}
===================================================================
RCS file:
/cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore/Attic/ecore_idle_enterer.c,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -3 -r1.1.2.3 -r1.1.2.4
--- ecore_idle_enterer.c 23 Jan 2003 23:51:41 -0000 1.1.2.3
+++ ecore_idle_enterer.c 25 Jan 2003 02:17:02 -0000 1.1.2.4
@@ -37,7 +37,12 @@
void *
ecore_idle_enterer_del(Ecore_Idle_Enterer *idle_enterer)
{
- if (!ECORE_MAGIC_CHECK(idle_enterer, ECORE_MAGIC_IDLE_ENTERER)) return NULL;
+ if (!ECORE_MAGIC_CHECK(idle_enterer, ECORE_MAGIC_IDLE_ENTERER))
+ {
+ ECORE_MAGIC_FAIL(idle_enterer, ECORE_MAGIC_IDLE_ENTERER,
+ "ecore_idle_enterer_del");
+ return NULL;
+ }
idle_enterer->delete_me = 1;
idle_enterers_delete_me = 1;
return idle_enterer->data;
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore/Attic/ecore_idler.c,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -3 -r1.1.2.3 -r1.1.2.4
--- ecore_idler.c 23 Jan 2003 23:51:41 -0000 1.1.2.3
+++ ecore_idler.c 25 Jan 2003 02:17:02 -0000 1.1.2.4
@@ -37,7 +37,12 @@
void *
ecore_idler_del(Ecore_Idler *idler)
{
- if (!ECORE_MAGIC_CHECK(idler, ECORE_MAGIC_IDLER)) return NULL;
+ if (!ECORE_MAGIC_CHECK(idler, ECORE_MAGIC_IDLER))
+ {
+ ECORE_MAGIC_FAIL(idler, ECORE_MAGIC_IDLER,
+ "ecore_idler_del");
+ return NULL;
+ }
idler->delete_me = 1;
idlers_delete_me = 1;
return idler->data;
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore/Attic/ecore_private.h,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -3 -r1.1.2.5 -r1.1.2.6
--- ecore_private.h 24 Jan 2003 15:36:25 -0000 1.1.2.5
+++ ecore_private.h 25 Jan 2003 02:17:02 -0000 1.1.2.6
@@ -28,7 +28,7 @@
#define ECORE_MAGIC_SET(d, m) (d)->__magic = (m)
#define ECORE_MAGIC_CHECK(d, m) ((d) && ((d)->__magic == (m)))
-#define ECORE_MAGIC_FAIL(d, m) _ecore_magic_fail((d), (d) ? (d)->__magic : 0,
(m));
+#define ECORE_MAGIC_FAIL(d, m, fn) _ecore_magic_fail((d), (d) ? (d)->__magic : 0,
+(m), (fn));
typedef int Ecore_Magic;
@@ -120,7 +120,7 @@
void *data;
};
-void _ecore_magic_fail(void *d, Ecore_Magic m, Ecore_Magic req_m);
+void _ecore_magic_fail(void *d, Ecore_Magic m, Ecore_Magic req_m, const char
+*fname);
double _ecore_timer_next_get(void);
int _ecore_timer_call(double when);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore/Attic/ecore_timer.c,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -3 -r1.1.2.3 -r1.1.2.4
--- ecore_timer.c 23 Jan 2003 23:51:41 -0000 1.1.2.3
+++ ecore_timer.c 25 Jan 2003 02:17:02 -0000 1.1.2.4
@@ -45,7 +45,12 @@
{
void *data;
- if (!ECORE_MAGIC_CHECK(timer, ECORE_MAGIC_TIMER)) return NULL;
+ if (!ECORE_MAGIC_CHECK(timer, ECORE_MAGIC_TIMER))
+ {
+ ECORE_MAGIC_FAIL(timer, ECORE_MAGIC_TIMER,
+ "ecore_timer_del");
+ return NULL;
+ }
timers = _ecore_list_remove(timers, timer);
data = timer->data;
ECORE_MAGIC_SET(timer, ECORE_MAGIC_NONE);
-------------------------------------------------------
This SF.NET email is sponsored by:
SourceForge Enterprise Edition + IBM + LinuxWorld = Something 2 See!
http://www.vasoftware.com
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
