Enlightenment CVS committal
Author : rbdpngn
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src
Modified Files:
ewl_config.c ewl_config.h ewl_debug.h ewl_fx.c ewl_theme.c
Log Message:
Made the debugging macros output less info, but the info wasn't real useful
anyways. This gains us some portability. Also fixed a problem with a variable
declaration in a header.
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_config.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -3 -r1.22 -r1.23
--- ewl_config.c 24 Jan 2003 17:06:18 -0000 1.22
+++ ewl_config.c 26 Mar 2003 05:22:02 -0000 1.23
@@ -16,6 +16,8 @@
static int __config_exists(char *name);
+Ewl_Config ewl_config;
+
extern Ewd_List *ewl_window_list;
/**
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_config.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- ewl_config.h 14 Jan 2003 21:44:59 -0000 1.17
+++ ewl_config.h 26 Mar 2003 05:22:02 -0000 1.18
@@ -24,7 +24,7 @@
} theme;
};
-Ewl_Config ewl_config;
+extern Ewl_Config ewl_config;
int ewl_config_init(void);
int ewl_config_set_str(char *config, char *k, char *v);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_debug.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- ewl_debug.h 25 May 2002 05:46:40 -0000 1.16
+++ ewl_debug.h 26 Mar 2003 05:22:02 -0000 1.17
@@ -66,30 +66,30 @@
return num; \
}
-#define D(lvl, fmt, args...) \
+#define D(lvl, fmt) \
{ \
if (ewl_config.debug.enable && ewl_config.debug.level >= lvl) \
{ \
fprintf(stderr, "<--> "); \
- fprintf(stderr, fmt, ## args); \
+ fprintf(stderr, fmt); \
fprintf(stderr, "\n"); \
} \
}
-#define DERROR(fmt, args...) \
+#define DERROR(fmt) \
{ \
ewl_print_warning(); \
fprintf(stderr, "\tIn function:\n\n" \
"\t%s();\n\n", __FUNCTION__); \
- fprintf(stderr, fmt, ## args); \
+ fprintf(stderr, fmt); \
}
-#define DWARNING(fmt, args...) \
+#define DWARNING(fmt) \
{ \
ewl_print_warning(); \
fprintf(stderr, "\tIn function:\n\n" \
"\t%s();\n\n", __FUNCTION__); \
- fprintf(stderr, fmt, ## args); \
+ fprintf(stderr, fmt); \
}
#define DCHECK_PARAM_PTR(str, ptr) \
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_fx.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -3 -r1.28 -r1.29
--- ewl_fx.c 14 Jan 2003 21:45:02 -0000 1.28
+++ ewl_fx.c 26 Mar 2003 05:22:02 -0000 1.29
@@ -110,7 +110,7 @@
*/
if (!w->appearance) {
D(DLEVEL_STABLE,
- "Widget %p does not have a appearance string\n", w);
+ "Widget does not have a appearance string\n");
DRETURN(DLEVEL_STABLE);
}
@@ -141,7 +141,7 @@
* No fx to apply, so our work is done.
*/
if (!count) {
- D(DLEVEL_STABLE, "No effects for widget %s", wname);
+ D(DLEVEL_STABLE, "No effects for widget\n");
DRETURN(DLEVEL_STABLE);
}
@@ -391,7 +391,7 @@
ewl_callback_prepend(w, EWL_CALLBACK_DESTROY,
__ewl_fx_func_stop, pend);
- D(DLEVEL_STABLE, "Effect %s added to %p properly", name, w);
+ D(DLEVEL_STABLE, "Effect added to widget properly");
DRETURN_INT(1, DLEVEL_STABLE);
}
@@ -564,7 +564,7 @@
if (!fxp) {
D(DLEVEL_STABLE,
- "Can't add timer since fx proto %s does not exist.\n", name);
+ "Can't add timer since fx proto does not exist.\n");
DRETURN(DLEVEL_STABLE);
}
@@ -574,7 +574,7 @@
if (!w->fx || ewd_list_is_empty(w->fx)) {
D(DLEVEL_STABLE,
"Trying to add effect to a widget which doesnt"
- "want have info about the effect %s\n", name);
+ "want have info about the effect\n");
} else {
/*
* Find the specified effect on the fx list.
@@ -652,7 +652,7 @@
snprintf(name2, PATH_LEN, "%s%p", name, w);
- D(DLEVEL_STABLE, "attempting to remove %s", name2);
+ D(DLEVEL_STABLE, "attempting to remove fx");
/*
* Check to see if the timer is on the table. If not, then we can't
@@ -661,7 +661,7 @@
timer = ewd_hash_remove(fx_timers, name2);
if (!timer) {
D(DLEVEL_STABLE,
- "Can't remove timer %s since it does not exists\n", name2);
+ "Can't remove fx timer since it does not exists\n");
DRETURN(DLEVEL_STABLE);
}
@@ -772,7 +772,7 @@
plugin = ewd_plugin_load(fx_group_id, name);
if (!plugin) {
- DWARNING("Could not load fx plugin %s.\n", name);
+ DWARNING("Could not load fx plugin.\n");
DRETURN_INT(0, DLEVEL_STABLE);
}
@@ -790,8 +790,8 @@
* trying to use this effect.
*/
if (!fxp) {
- DWARNING("Symbol load() failed to be called in plugin %s\n"
- "Please contact the author.\n", name);
+ DWARNING("Symbol load() failed to be called in plugin\n"
+ "Please contact the author.\n");
DRETURN_INT(0, DLEVEL_STABLE);
}
@@ -1103,7 +1103,7 @@
* later.
*/
if (!w->appearance) {
- DWARNING("Widget %p does not have a appearance string\n", w);
+ DWARNING("Widget does not have a appearance string\n");
DRETURN(DLEVEL_STABLE);
}
@@ -1118,7 +1118,7 @@
* If no fx for this widget then return.
*/
if (!count) {
- D(DLEVEL_STABLE, "No effects for widget %s", wname);
+ D(DLEVEL_STABLE, "No effects for widget");
DRETURN(DLEVEL_STABLE);
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_theme.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -3 -r1.39 -r1.40
--- ewl_theme.c 26 Mar 2003 05:10:00 -0000 1.39
+++ ewl_theme.c 26 Mar 2003 05:22:03 -0000 1.40
@@ -72,7 +72,7 @@
}
if (!theme_db) {
- DERROR("No theme db %s =( exiting....", theme_db_path);
+ DERROR("No theme db =( exiting....");
exit(-1);
}
}
@@ -231,7 +231,7 @@
path = strdup(data);
if (((stat(path, &st)) == -1) || !S_ISREG(st.st_mode))
- DWARNING("Couldn't stat %s\n", path);
+ DWARNING("Couldn't stat image\n");
DRETURN_PTR(path, DLEVEL_STABLE);
}
-------------------------------------------------------
This SF.net email is sponsored by:
The Definitive IT and Networking Event. Be There!
NetWorld+Interop Las Vegas 2003 -- Register today!
http://ads.sourceforge.net/cgi-bin/redirect.pl?keyn0001en
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs