From 97ebfc5f2bd708caca627545cde05623151c070a Mon Sep 17 00:00:00 2001 From: Gustavo Sverzut Barbieri Date: Wed, 10 Feb 2010 20:23:27 +0000 Subject: [PATCH] proper error logging for _edje_lua_error() ERR() should not be used there, because _edje_lua_error() is already an error logging function. Instead we should call eina_log_print() directly, handling the source of the error. SVN revision: 46058 --- legacy/edje/src/lib/edje_lua.c | 6 ++++-- legacy/edje/src/lib/edje_private.h | 5 ++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/legacy/edje/src/lib/edje_lua.c b/legacy/edje/src/lib/edje_lua.c index e73355b8f5..bd20c979bb 100644 --- a/legacy/edje/src/lib/edje_lua.c +++ b/legacy/edje/src/lib/edje_lua.c @@ -141,7 +141,7 @@ struct _Edje_Lua_Edje_Part_Description }; void -_edje_lua_error(lua_State *L, int err_code) +__edje_lua_error(const char *file, const char *fnc, int line, lua_State *L, int err_code) { char *err_type; @@ -163,7 +163,9 @@ _edje_lua_error(lua_State *L, int err_code) err_type = "unknown"; break; } - ERR("Lua %s error: %s", err_type, lua_tostring(L, -1)); + eina_log_print + (_edje_default_log_dom, EINA_LOG_LEVEL_ERR, file, fnc, line, + "Lua %s error: %s", err_type, lua_tostring(L, -1)); // don't exit. this is BAD. lua script bugs will cause thngs like e to // exit mysteriously endig your x session. bad! // exit(-1); diff --git a/legacy/edje/src/lib/edje_private.h b/legacy/edje/src/lib/edje_private.h index 814432803f..137d9e38b0 100644 --- a/legacy/edje/src/lib/edje_private.h +++ b/legacy/edje/src/lib/edje_private.h @@ -1435,7 +1435,10 @@ void _edje_lua_script_fn_new(Edje *ed); void _edje_lua_group_fn_new(Edje *ed); void _edje_lua_init(); void _edje_lua_shutdown(); -void _edje_lua_error(lua_State *L, int err_code); + +void __edje_lua_error(const char *file, const char *fnc, int line, lua_State *L, int err_code); +#define _edje_lua_error(L, err_code) \ + __edje_lua_error(__FILE__, __FUNCTION__, __LINE__, L, err_code) int _edje_lua_script_only(Edje *ed); void _edje_lua_script_only_init(Edje *ed);