elua lib: more Elua_State usage

diff --git a/src/bin/elua/main.c b/src/bin/elua/main.c
index cdd88f79afa2319a555a2cb26f0bedf709f58b1c..b32058d0c6828d29f4c67aca978ccdbb79e19d8b 100644 (file)
--- a/src/bin/elua/main.c
+++ b/src/bin/elua/main.c
@@ -454,7 +454,7 @@ elua_main(lua_State *L)
    elua_state_setup_i18n(es);
    lua_call(L, 1, 0);
 
-   elua_io_register(L);
+   elua_io_register(es);
    lua_gc(L, LUA_GCRESTART, 0);
 
    INF("elua lua state initialized");

diff --git a/src/lib/elua/Elua.h b/src/lib/elua/Elua.h
index 2010a5aa961d79de62821364c0df30bc16a82d06..f782c414ebbb1e464c9aacb67e5120e72616bb49 100644 (file)
--- a/src/lib/elua/Elua.h
+++ b/src/lib/elua/Elua.h
@@ -85,7 +85,7 @@ EAPI void elua_state_setup_i18n(Elua_State *es);
 
 EAPI int elua_io_popen(lua_State *L);
 EAPI int elua_io_loadfile(Elua_State *es, const char *fname);
-EAPI void elua_io_register(lua_State *L);
+EAPI void elua_io_register(Elua_State *es);
 
 #endif
 

diff --git a/src/lib/elua/cache.c b/src/lib/elua/cache.c
index 2bc0cbef05f60c77915ee5993311ba58b7c2eba1..26ce948eade84832332789d4b7701cf479c4e99a 100644 (file)
--- a/src/lib/elua/cache.c
+++ b/src/lib/elua/cache.c
@@ -209,8 +209,9 @@ loadfile(lua_State *L)
 }
 
 EAPI void
-elua_io_register(lua_State *L)
+elua_io_register(Elua_State *es)
 {
-   lua_pushcfunction(L, loadfile);
-   lua_setglobal(L, "loadfile");
+   EINA_SAFETY_ON_FALSE_RETURN(es && es->luastate);
+   lua_pushcfunction(es->luastate, loadfile);
+   lua_setglobal(es->luastate, "loadfile");
 }