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.

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/edje@46058 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/src/lib/edje_lua.c b/src/lib/edje_lua.c
index e73355b..bd20c97 100644 (file)
--- a/src/lib/edje_lua.c
+++ b/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/src/lib/edje_private.h b/src/lib/edje_private.h
index 8144328..137d9e3 100644 (file)
--- a/src/lib/edje_private.h
+++ b/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);