[EGIT] [core/efl] master 01/01: elua: lose support for loadfile modes for the time being

[Daniel Kolesa]

q66 pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=f0d008abf86927482c21e01553aade203e6ce4c8

commit f0d008abf86927482c21e01553aade203e6ce4c8
Author: Daniel Kolesa <d.kol...@samsung.com>
Date:   Wed Jun 11 10:41:02 2014 +0100

    elua: lose support for loadfile modes for the time being
---
 src/bin/elua/cache.c | 25 +++++++++----------------
 src/bin/elua/main.h  |  1 -
 2 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/src/bin/elua/cache.c b/src/bin/elua/cache.c
index 37fdeaa..7542978 100644
--- a/src/bin/elua/cache.c
+++ b/src/bin/elua/cache.c
@@ -31,11 +31,11 @@ check_bc(Eina_File *of, const char *fname, Eina_Bool *bc)
 }
 
 static Eina_File *
-open_src(const char *fname, const char *mode, Eina_Bool *bc)
+open_src(const char *fname, Eina_Bool *bc)
 {
    Eina_File  *f   = NULL;
    const char *ext = strstr(fname, ".lua");
-   if (ext && !ext[4] && (!mode || strchr(mode, 't')))
+   if (ext && !ext[4])
      {
         char buf[PATH_MAX];
         snprintf(buf, sizeof(buf), "%sc", fname);
@@ -79,10 +79,10 @@ getf(lua_State *L EINA_UNUSED, void *ud, size_t *size)
 }
 
 static int
-elua_loadstdin(lua_State *L, const char *mode)
+elua_loadstdin(lua_State *L)
 {
    char buff[LUAL_BUFFERSIZE];
-   int status = lua_loadx(L, getf, &buff, "=stdin", mode);
+   int status = lua_load(L, getf, &buff, "=stdin");
    if (ferror(stdin))
      {
         lua_pop(L, 1);
@@ -110,7 +110,7 @@ getf_map(lua_State *L EINA_UNUSED, void *ud, size_t *size)
 }
 
 int
-elua_loadfilex(lua_State *L, const char *fname, const char *mode)
+elua_loadfile(lua_State *L, const char *fname)
 {
    Map_Stream s;
    int status;
@@ -119,9 +119,9 @@ elua_loadfilex(lua_State *L, const char *fname, const char 
*mode)
    Eina_Bool bcache = EINA_FALSE;
    if (!fname)
      {
-        return elua_loadstdin(L, mode);
+        return elua_loadstdin(L);
      }
-   if (!(f = open_src(fname, mode, &bcache)))
+   if (!(f = open_src(fname, &bcache)))
      {
         lua_pushfstring(L, "cannot open %s: %s", fname, strerror(errno));
         return LUA_ERRFILE;
@@ -134,7 +134,7 @@ elua_loadfilex(lua_State *L, const char *fname, const char 
*mode)
         lua_remove(L, -2);
         return LUA_ERRFILE;
      }
-   status = lua_loadx(L, getf_map, &s, chname, mode);
+   status = lua_load(L, getf_map, &s, chname);
    eina_file_map_free(f, s.fmap);
    eina_file_close(f);
    if (!status && bcache) write_bc(L, fname);
@@ -142,20 +142,13 @@ elua_loadfilex(lua_State *L, const char *fname, const 
char *mode)
    return status;
 }
 
-int
-elua_loadfile(lua_State *L, const char *fname)
-{
-   return elua_loadfilex(L, fname, NULL);
-}
-
 /* lua function */
 
 static int
 loadfile(lua_State *L)
 {
    const char *fname = luaL_optstring(L, 1, NULL);
-   const char *mode  = luaL_optstring(L, 2, NULL);
-   int status = elua_loadfilex(L, fname, mode),
+   int status = elua_loadfile(L, fname),
        hasenv = (lua_gettop(L) >= 3);
    if (!status)
      {
diff --git a/src/bin/elua/main.h b/src/bin/elua/main.h
index 8dbbfdc..6158d53 100644
--- a/src/bin/elua/main.h
+++ b/src/bin/elua/main.h
@@ -35,7 +35,6 @@ extern int el_log_domain;
 #define ERR(...) EINA_LOG_DOM_ERR(el_log_domain, __VA_ARGS__)
 #define CRT(...) EINA_LOG_DOM_CRITICAL(el_log_domain, __VA_ARGS__)
 
-int elua_loadfilex(lua_State *L, const char *fname, const char *mode);
 int elua_loadfile(lua_State *L, const char *fname);
 void elua_register_cache(lua_State *L);
 

--