Enlightenment CVS committal
Author : doursse
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/lib
Modified Files:
ewl_debug.h
Log Message:
fix some checks and casts in debug defines
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_debug.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- ewl_debug.h 22 Oct 2005 15:57:49 -0000 1.8
+++ ewl_debug.h 23 Oct 2005 17:02:18 -0000 1.9
@@ -16,7 +16,7 @@
#define DENTER_FUNCTION(lvl) \
{ \
- if (ewl_config.debug.enable && (ewl_config.debug.level >= lvl)) \
+ if (ewl_config.debug.enable && (ewl_config.debug.level >= (lvl))) \
{ \
fprintf(stderr, " --> %s:%i\tEntering %s();\n", \
__FILE__, __LINE__, __FUNCTION__); \
@@ -25,7 +25,7 @@
#define DLEAVE_FUNCTION(lvl) \
{ \
- if (ewl_config.debug.enable && ewl_config.debug.level >= lvl) \
+ if (ewl_config.debug.enable && (ewl_config.debug.level >= (lvl))) \
{ \
fprintf(stderr, "<-- %s:%i\tLeaving %s();\n", \
__FILE__, __LINE__, __FUNCTION__); \
@@ -35,7 +35,7 @@
#define DRETURN(lvl) \
{ \
DLEAVE_FUNCTION(lvl); \
- if (ewl_config.debug.enable && ewl_config.debug.level >= lvl) \
+ if (ewl_config.debug.enable && (ewl_config.debug.level >= (lvl))) \
{ \
fprintf(stderr, "<-- %s:%i\tReturn in %s();\n", \
__FILE__, __LINE__, __FUNCTION__); \
@@ -46,21 +46,21 @@
#define DRETURN_PTR(ptr, lvl) \
{ \
DLEAVE_FUNCTION(lvl); \
- if (ewl_config.debug.enable && ewl_config.debug.level >= lvl) \
+ if (ewl_config.debug.enable && (ewl_config.debug.level >= (lvl))) \
{ \
fprintf(stderr, "<-- %s:%i\tReturning %p in %s();\n", \
- __FILE__, __LINE__, (void *)ptr, __FUNCTION__); \
+ __FILE__, __LINE__, (void *) (ptr), __FUNCTION__); \
} \
- return (void *)ptr; \
+ return (void *)(ptr); \
}
#define DRETURN_FLOAT(num, lvl) \
{ \
DLEAVE_FUNCTION(lvl); \
- if (ewl_config.debug.enable && ewl_config.debug.level >= lvl) \
+ if (ewl_config.debug.enable && (ewl_config.debug.level >= (lvl))) \
{ \
fprintf(stderr, "<-- %s:%i\tReturning %f in %s();\n", \
- __FILE__, __LINE__, (float) num, __FUNCTION__); \
+ __FILE__, __LINE__, (float) (num), __FUNCTION__); \
} \
return num; \
}
@@ -68,10 +68,10 @@
#define DRETURN_INT(num, lvl) \
{ \
DLEAVE_FUNCTION(lvl); \
- if (ewl_config.debug.enable && ewl_config.debug.level >= lvl) \
+ if (ewl_config.debug.enable && (ewl_config.debug.level >= (lvl))) \
{ \
fprintf(stderr, "<-- %s:%i\tReturning %i in %s();\n", \
- __FILE__, __LINE__, (int) num, __FUNCTION__); \
+ __FILE__, __LINE__, (int) (num), __FUNCTION__); \
} \
return num; \
}
@@ -87,7 +87,7 @@
#define DCHECK_PARAM_PTR(str, ptr) \
{ \
- if (!ptr) \
+ if (!(ptr)) \
{ \
ewl_print_warning(); \
fprintf(stderr, "\tThis program is calling:\n\n" \
@@ -103,7 +103,7 @@
#define DCHECK_PARAM_PTR_RET(str, ptr, ret) \
{ \
- if (!ptr) \
+ if (!(ptr)) \
{ \
ewl_print_warning(); \
fprintf(stderr, "\tThis program is calling:\n\n" \
@@ -155,19 +155,19 @@
#define DENTER_FUNCTION(lvl) {}
#define DLEAVE_FUNCTION(lvl) {}
#define DRETURN(lvl) return
-#define DRETURN_PTR(ptr, lvl) return (void *)ptr
+#define DRETURN_PTR(ptr, lvl) return (void *)(ptr)
#define DRETURN_FLOAT(num, lvl) return num
#define DRETURN_INT(num, lvl) return num
#define DWARNING(fmt) {}
#define DCHECK_PARAM_PTR(str, ptr) \
{ \
- if (!ptr) { \
+ if (!(ptr)) { \
return; \
} \
}
#define DCHECK_PARAM_PTR_RET(str, ptr, ret) \
{ \
- if (!ptr) { \
+ if (!(ptr)) { \
return ret; \
} \
}
-------------------------------------------------------
This SF.Net email is sponsored by the JBoss Inc.
Get Certified Today * Register for a JBoss Training Course
Free Certification Exam for All Training Attendees Through End of 2005
Visit http://www.jboss.com/services/certification for more information
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
