elua lib: unify API conventions

diff --git a/src/bin/elua/main.c b/src/bin/elua/main.c
index 48665699f953f4d1f1776b4ecab939454513860e..ca7ccc1ab22c88076b707a5e286b7a13cfcf5790 100644 (file)
--- a/src/bin/elua/main.c
+++ b/src/bin/elua/main.c
@@ -110,11 +110,10 @@ elua_main(lua_State *L)
    elua_state_dirs_set(es, coredir, moddir, appsdir);
    elua_state_dirs_fill(es, noenv);
 
-   if (!elua_state_setup_modules(es) || !elua_state_setup_i18n(es))
+   if (!elua_state_modules_setup(es) || !elua_state_i18n_setup(es)
+    || !elua_state_io_setup(es))
      goto error;
 
-   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 e9bd6eeee90b109796124a5e37a99d2fce88234e..8d00e674642751e268475f1e676a893abfc55ab7 100644 (file)
--- a/src/lib/elua/Elua.h
+++ b/src/lib/elua/Elua.h
@@ -87,15 +87,15 @@ EAPI Eina_Bool elua_state_appload_ref_push(Elua_State *es);
 
 EAPI lua_State *elua_state_lua_state_get(const Elua_State *es);
 
-EAPI int elua_report_error(const Elua_State *es, const char *pname, int status);
+EAPI int elua_error_report(const Elua_State *es, const char *pname, int status);
 
-EAPI Eina_Bool elua_state_setup_i18n(const Elua_State *es);
-EAPI Eina_Bool elua_state_setup_modules(const Elua_State *es);
+EAPI Eina_Bool elua_state_i18n_setup(const Elua_State *es);
+EAPI Eina_Bool elua_state_modules_setup(const Elua_State *es);
+EAPI Eina_Bool elua_state_io_setup(const Elua_State *es);
 
 EAPI int elua_io_loadfile(const Elua_State *es, const char *fname);
-EAPI void elua_io_register(const Elua_State *es);
-
 EAPI int elua_io_popen(lua_State *L);
+
 EAPI int elua_module_init(lua_State *L);
 EAPI int elua_module_system_init(lua_State *L);
 

diff --git a/src/lib/elua/cache.c b/src/lib/elua/cache.c
index 8cd1617f61e133c12ca24c5e25223de28e723e44..ae5cf9371609dabcc721c8cf4f9d0c6c07638806 100644 (file)
--- a/src/lib/elua/cache.c
+++ b/src/lib/elua/cache.c
@@ -208,10 +208,11 @@ loadfile(lua_State *L)
    return 2;
 }
 
-EAPI void
-elua_io_register(const Elua_State *es)
+EAPI Eina_Bool
+elua_state_io_setup(const Elua_State *es)
 {
-   EINA_SAFETY_ON_FALSE_RETURN(es && es->luastate);
+   EINA_SAFETY_ON_FALSE_RETURN_VAL(es && es->luastate, EINA_FALSE);
    lua_pushcfunction(es->luastate, loadfile);
    lua_setglobal(es->luastate, "loadfile");
+   return EINA_TRUE;
 }

diff --git a/src/lib/elua/elua.c b/src/lib/elua/elua.c
index c124b20afc8e90de059fd06af7af9909ae5364f1..020768194783407456fac15eecff709e1b7ef201 100644 (file)
--- a/src/lib/elua/elua.c
+++ b/src/lib/elua/elua.c
@@ -237,7 +237,7 @@ _elua_errmsg(const char *pname, const char *msg)
 }
 
 EAPI int
-elua_report_error(const Elua_State *es, const char *pname, int status)
+elua_error_report(const Elua_State *es, const char *pname, int status)
 {
    EINA_SAFETY_ON_FALSE_RETURN_VAL(es && es->luastate, status);
    if (status && !lua_isnil(es->luastate, -1))
@@ -284,7 +284,7 @@ const luaL_reg gettextlib[] =
 };
 
 EAPI Eina_Bool
-elua_state_setup_i18n(const Elua_State *es)
+elua_state_i18n_setup(const Elua_State *es)
 {
 #ifdef ENABLE_NLS
    char *(*dgettextp)(const char*, const char*) = dgettext;
@@ -297,7 +297,7 @@ elua_state_setup_i18n(const Elua_State *es)
    EINA_SAFETY_ON_NULL_RETURN_VAL(es->coredir, EINA_FALSE);
    EINA_SAFETY_ON_NULL_RETURN_VAL(es->progname, EINA_FALSE);
    snprintf(buf, sizeof(buf), "%s/gettext.lua", es->coredir);
-   if (elua_report_error(es, es->progname, elua_io_loadfile(es, buf)))
+   if (elua_error_report(es, es->progname, elua_io_loadfile(es, buf)))
      return EINA_FALSE;
    lua_createtable(es->luastate, 0, 0);
    luaL_register(es->luastate, NULL, gettextlib);
@@ -319,7 +319,7 @@ const luaL_reg _elua_cutillib[] =
 };
 
 EAPI Eina_Bool
-elua_state_setup_modules(const Elua_State *es)
+elua_state_modules_setup(const Elua_State *es)
 {
    char buf[PATH_MAX];
    EINA_SAFETY_ON_NULL_RETURN_VAL(es, EINA_FALSE);
@@ -327,7 +327,7 @@ elua_state_setup_modules(const Elua_State *es)
    EINA_SAFETY_ON_NULL_RETURN_VAL(es->coredir, EINA_FALSE);
    EINA_SAFETY_ON_NULL_RETURN_VAL(es->progname, EINA_FALSE);
    snprintf(buf, sizeof(buf), "%s/module.lua", es->coredir);
-   if (elua_report_error(es, es->progname, elua_io_loadfile(es, buf)))
+   if (elua_error_report(es, es->progname, elua_io_loadfile(es, buf)))
      return EINA_FALSE;
    lua_pushcfunction(es->luastate, elua_module_system_init);
    lua_createtable(es->luastate, 0, 0);
@@ -453,7 +453,7 @@ elua_util_require(Elua_State *es, const char *libname)
    EINA_SAFETY_ON_NULL_RETURN_VAL(es->luastate, -1);
    EINA_SAFETY_ON_FALSE_RETURN_VAL(elua_state_require_ref_push(es), -1);
    lua_pushstring(es->luastate, libname);
-   return elua_report_error(es, es->progname,
+   return elua_error_report(es, es->progname,
                             lua_pcall(es->luastate, 1, 0, 0));
 }
 
@@ -462,7 +462,7 @@ elua_util_file_run(Elua_State *es, const char *fname)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(es, -1);
    EINA_SAFETY_ON_NULL_RETURN_VAL(es->luastate, -1);
-   return elua_report_error(es, es->progname,
+   return elua_error_report(es, es->progname,
                             elua_io_loadfile(es, fname)
                             || _elua_docall(es, 0, 1));
 }
@@ -472,7 +472,7 @@ elua_util_string_run(Elua_State *es, const char *chunk, const char *chname)
 {
    EINA_SAFETY_ON_NULL_RETURN_VAL(es, -1);
    EINA_SAFETY_ON_NULL_RETURN_VAL(es->luastate, -1);
-   return elua_report_error(es, es->progname,
+   return elua_error_report(es, es->progname,
                             luaL_loadbuffer(es->luastate, chunk, strlen(chunk),
                                             chname)
                             || _elua_docall(es, 0, 0));
@@ -531,5 +531,5 @@ elua_util_script_run(Elua_State *es, int argc, char **argv, int n, int *quit)
         *quit = lua_toboolean(es->luastate, -1);
         lua_pop(es->luastate, 1);
      }
-   return elua_report_error(es, es->progname, status);
+   return elua_error_report(es, es->progname, status);
 }