Enlightenment CVS committal
Author : dj2
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/lib
Modified Files:
ewl_colorpicker.c ewl_container.c ewl_debug.h ewl_embed.c
ewl_filedialog.c ewl_media.c ewl_seeker.c ewl_text.c
ewl_theme.c ewl_widget.c ewl_window.c
Log Message:
- the DCHECK_TYPE function didn't have a return; at the end like it should,
fixed.
- fixed all of the DCHECK_TYPE calls that should have been DCHECK_TYPE_RET
calls
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_colorpicker.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- ewl_colorpicker.c 15 Feb 2006 20:04:59 -0000 1.16
+++ ewl_colorpicker.c 20 Apr 2006 04:09:51 -0000 1.17
@@ -554,7 +554,7 @@
{
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR_RET("cp", cp, FALSE);
- DCHECK_TYPE("cp", cp, EWL_COLORPICKER_TYPE);
+ DCHECK_TYPE_RET("cp", cp, EWL_COLORPICKER_TYPE, FALSE);
DRETURN_INT(cp->mode, DLEVEL_STABLE);
}
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_container.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -3 -r1.38 -r1.39
--- ewl_container.c 18 Feb 2006 06:39:35 -0000 1.38
+++ ewl_container.c 20 Apr 2006 04:09:51 -0000 1.39
@@ -682,7 +682,7 @@
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR_RET("widget", widget, NULL);
- DCHECK_TYPE("widget", widget, EWL_WIDGET_TYPE);
+ DCHECK_TYPE_RET("widget", widget, EWL_WIDGET_TYPE, NULL);
if (!widget->children || ecore_dlist_is_empty(widget->children))
DRETURN_PTR(NULL, DLEVEL_STABLE);
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_debug.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -3 -r1.18 -r1.19
--- ewl_debug.h 11 Apr 2006 16:39:38 -0000 1.18
+++ ewl_debug.h 20 Apr 2006 04:09:51 -0000 1.19
@@ -160,6 +160,7 @@
"NULL") , type); \
ewl_backtrace(); \
ewl_segv(); \
+ return; \
} \
}
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_embed.c,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -3 -r1.55 -r1.56
--- ewl_embed.c 12 Apr 2006 06:41:55 -0000 1.55
+++ ewl_embed.c 20 Apr 2006 04:09:51 -0000 1.56
@@ -994,7 +994,7 @@
{
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR_RET("w", w, NULL);
- DCHECK_TYPE("w", w, EWL_WIDGET_TYPE);
+ DCHECK_TYPE_RET("w", w, EWL_WIDGET_TYPE, NULL);
while (w->parent)
w = w->parent;
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_filedialog.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -3 -r1.22 -r1.23
--- ewl_filedialog.c 13 Apr 2006 20:37:22 -0000 1.22
+++ ewl_filedialog.c 20 Apr 2006 04:09:51 -0000 1.23
@@ -211,7 +211,7 @@
{
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR_RET("fd", fd, NULL);
- DCHECK_TYPE("fd", fd, EWL_FILEDIALOG_TYPE);
+ DCHECK_TYPE_RET("fd", fd, EWL_FILEDIALOG_TYPE, NULL);
DRETURN_PTR(ewl_filepicker_directory_get(EWL_FILEPICKER(fd->fp)),
DLEVEL_STABLE);
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_media.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- ewl_media.c 20 Apr 2006 03:27:07 -0000 1.16
+++ ewl_media.c 20 Apr 2006 04:09:51 -0000 1.17
@@ -388,7 +388,7 @@
{
DENTER_FUNCTION(DLEVEL_STABLE)
DCHECK_PARAM_PTR_RET("m", m, 0);
- DCHECK_TYPE("m", m, EWL_MEDIA_TYPE);
+ DCHECK_TYPE_RET("m", m, EWL_MEDIA_TYPE, 0);
DRETURN_INT(m->mute, DLEVEL_STABLE);
}
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_seeker.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- ewl_seeker.c 17 Feb 2006 06:43:33 -0000 1.14
+++ ewl_seeker.c 20 Apr 2006 04:09:51 -0000 1.15
@@ -738,7 +738,7 @@
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR_RET("s", s, 0.0);
- DCHECK_TYPE("s", s, EWL_SEEKER_TYPE);
+ DCHECK_TYPE_RET("s", s, EWL_SEEKER_TYPE, 0.0);
if (s->orientation == EWL_ORIENTATION_HORIZONTAL) {
m = mx;
@@ -786,11 +786,10 @@
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR_RET("data", data, FALSE);
- DCHECK_TYPE("data", data, EWL_SEEKER_TYPE);
+ DCHECK_TYPE_RET("data", data, EWL_SEEKER_TYPE, FALSE);
s = EWL_SEEKER(data);
-
- value = ewl_seeker_value_get(EWL_SEEKER(s));
+ value = ewl_seeker_value_get(s);
/*
* Find the value based on mouse position
@@ -821,3 +820,4 @@
DRETURN_INT(TRUE, DLEVEL_STABLE);
}
+
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_text.c,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -3 -r1.96 -r1.97
--- ewl_text.c 19 Apr 2006 03:07:45 -0000 1.96
+++ ewl_text.c 20 Apr 2006 04:09:51 -0000 1.97
@@ -919,7 +919,7 @@
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR_RET("t", t, NULL);
- DCHECK_TYPE("t", t, EWL_TEXT_TYPE);
+ DCHECK_TYPE_RET("t", t, EWL_TEXT_TYPE, NULL);
tx = ewl_text_tree_context_get(t->formatting.tree, idx);
if (tx && tx->font)
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_theme.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- ewl_theme.c 27 Jan 2006 05:49:57 -0000 1.21
+++ ewl_theme.c 20 Apr 2006 04:09:51 -0000 1.22
@@ -371,7 +371,7 @@
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR_RET("w", w, NULL);
DCHECK_PARAM_PTR_RET("k", k, NULL);
- DCHECK_TYPE("w", w, EWL_WIDGET_TYPE);
+ DCHECK_TYPE_RET("w", w, EWL_WIDGET_TYPE, NULL);
data = ewl_theme_data_str_get(w, k);
if (!data)
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_widget.c,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -3 -r1.73 -r1.74
--- ewl_widget.c 15 Apr 2006 05:12:52 -0000 1.73
+++ ewl_widget.c 20 Apr 2006 04:09:51 -0000 1.74
@@ -525,7 +525,7 @@
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR_RET("w", w, NULL);
DCHECK_PARAM_PTR_RET("k", k, NULL);
- DCHECK_TYPE("w", w, EWL_WIDGET_TYPE);
+ DCHECK_TYPE_RET("w", w, EWL_WIDGET_TYPE, NULL);
if (!w->data)
DRETURN_PTR(NULL, DLEVEL_STABLE);
@@ -547,7 +547,7 @@
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR_RET("w", w, NULL);
DCHECK_PARAM_PTR_RET("k", k, NULL);
- DCHECK_TYPE("w", w, EWL_WIDGET_TYPE);
+ DCHECK_TYPE_RET("w", w, EWL_WIDGET_TYPE, NULL);
if (!w->data)
DRETURN_PTR(NULL, DLEVEL_STABLE);
@@ -607,7 +607,7 @@
{
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR_RET("w", w, NULL);
- DCHECK_TYPE("w", w, EWL_WIDGET_TYPE);
+ DCHECK_TYPE_RET("w", w, EWL_WIDGET_TYPE, NULL);
DRETURN_PTR((w->appearance ? strdup(w->appearance) : NULL),
DLEVEL_STABLE);
}
@@ -626,7 +626,7 @@
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR_RET("w", w, NULL);
- DCHECK_TYPE("w", w, EWL_WIDGET_TYPE);
+ DCHECK_TYPE_RET("w", w, EWL_WIDGET_TYPE, NULL);
/*
* Allocate enough for the appearance plus a leading "/"
@@ -660,7 +660,7 @@
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR_RET("w", w, NULL);
- DCHECK_TYPE("w", w, EWL_WIDGET_TYPE);
+ DCHECK_TYPE_RET("w", w, EWL_WIDGET_TYPE, NULL);
ret = ewl_widget_appearance_path_size_get(w, &len);
@@ -1086,7 +1086,7 @@
{
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR_RET("w", w, 0);
- DCHECK_TYPE("w", w, EWL_WIDGET_TYPE);
+ DCHECK_TYPE_RET("w", w, EWL_WIDGET_TYPE, 0);
DRETURN_INT(LAYER(w), DLEVEL_STABLE);
}
@@ -1285,7 +1285,7 @@
{
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR_RET("w", w, FALSE);
- DCHECK_TYPE("w", w, EWL_WIDGET_TYPE);
+ DCHECK_TYPE_RET("w", w, EWL_WIDGET_TYPE, FALSE);
if (ewl_object_flags_has(EWL_OBJECT(w),
EWL_FLAG_PROPERTY_BLOCK_TAB_FOCUS,
@@ -1329,7 +1329,7 @@
{
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR_RET("w", w, FALSE);
- DCHECK_TYPE("w", w, EWL_WIDGET_TYPE);
+ DCHECK_TYPE_RET("w", w, EWL_WIDGET_TYPE, FALSE);
if (ewl_object_flags_has(EWL_OBJECT(w),
EWL_FLAG_PROPERTY_FOCUSABLE,
@@ -1595,7 +1595,7 @@
Ewl_Embed *emb;
DCHECK_PARAM_PTR_RET("w", w, 0);
- DCHECK_TYPE("w", w, EWL_WIDGET_TYPE);
+ DCHECK_TYPE_RET("w", w, EWL_WIDGET_TYPE, 0);
/*
* Until an embed is present, the widget is off screen by default.
@@ -1726,7 +1726,7 @@
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR_RET("c", c, FALSE);
- DCHECK_TYPE("c", c, EWL_WIDGET_TYPE);
+ DCHECK_TYPE_RET("c", c, EWL_WIDGET_TYPE, FALSE);
if (!w) {
DRETURN_INT(FALSE, DLEVEL_STABLE);
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_window.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -3 -r1.41 -r1.42
--- ewl_window.c 13 Apr 2006 21:18:00 -0000 1.41
+++ ewl_window.c 20 Apr 2006 04:09:51 -0000 1.42
@@ -200,7 +200,7 @@
{
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR_RET("win", win, NULL);
- DCHECK_TYPE("win", win, EWL_WINDOW_TYPE);
+ DCHECK_TYPE_RET("win", win, EWL_WINDOW_TYPE, NULL);
DRETURN_PTR(strdup(win->name), DLEVEL_STABLE);
}
-------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
