[syslinux:master] lua: return the modified object from the initramfs methods

syslinux-bot for Ferenc Wágner wferi at niif.hu
Sat Feb 14 11:09:30 PST 2015


Commit-ID:  7952d37662a5738ba22eef45b5eae4f2ff41e909
Gitweb:     http://www.syslinux.org/commit/7952d37662a5738ba22eef45b5eae4f2ff41e909
Author:     Ferenc Wágner <wferi at niif.hu>
AuthorDate: Mon, 13 Oct 2014 11:26:47 +0200
Committer:  Ferenc Wágner <wferi at niif.hu>
CommitDate: Mon, 13 Oct 2014 12:44:15 +0200

lua: return the modified object from the initramfs methods

Signed-off-by: Ferenc Wágner <wferi at niif.hu>

---
 com32/lua/doc/syslinux.asc | 6 ++++--
 com32/lua/src/syslinux.c   | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/com32/lua/doc/syslinux.asc b/com32/lua/doc/syslinux.asc
index 95e0e44..6475d42 100644
--- a/com32/lua/doc/syslinux.asc
+++ b/com32/lua/doc/syslinux.asc
@@ -94,10 +94,12 @@ initramfs()::
 Return an empty _initramfs_ object.  Its methods are:
 
 load(filename):::
-Load contents of +filename+ into an _initramfs_.
+Load contents of +filename+ into an _initramfs_ and return the
+extended object.
 
 add_file(filename[,data[,do_mkdir[,mode]]]):::
-Add +filename+ of +mode+ containing +data+ to an _initramfs_.
+Add +filename+ of +mode+ containing +data+ to an _initramfs_ and
+return the extended object.
 If +do_mkdir+, create parent directories, too.  +mode+ defaults
 to 7*64+5*8+5 (which is 0755 in octal).
 
diff --git a/com32/lua/src/syslinux.c b/com32/lua/src/syslinux.c
index 18934e1..9a2998b 100644
--- a/com32/lua/src/syslinux.c
+++ b/com32/lua/src/syslinux.c
@@ -296,7 +296,8 @@ static int sl_initramfs_load_archive(lua_State * L)
 
     if (initramfs_load_archive (luaL_checkudata(L, 1, SYSLINUX_INITRAMFS), filename))
         return luaL_error (L, "Loading initramfs %s failed", filename);
-    return 0;
+    lua_settop (L, 1);
+    return 1;
 }
 
 static int sl_initramfs_add_file(lua_State * L)
@@ -315,7 +316,8 @@ static int sl_initramfs_add_file(lua_State * L)
                            data, file_len, file_len, filename,
                            luaL_optint (L, 4, 0), luaL_optint (L, 5, 0755)))
         return luaL_error (L, "Adding file %s to initramfs failed", filename);
-    return 0;
+    lua_settop (L, 1);
+    return 1;
 }
 
 static int sl_initramfs_size (lua_State *L)


More information about the Syslinux-commits mailing list