diff options
author | Erwan Velu <erwanaliasr1@gmail.com> | 2011-02-06 23:42:54 +0100 |
---|---|---|
committer | Erwan Velu <erwanaliasr1@gmail.com> | 2011-02-06 23:42:54 +0100 |
commit | a200ad6d3b0da02a196fc49ed3c73014aae1b542 (patch) | |
tree | c68744953dd0fbaecb5244114b26a13511a9ce48 /com32/lua | |
parent | e0494be7b038a05dfe1093d2c1abde3599d6270f (diff) | |
download | syslinux-a200ad6d3b0da02a196fc49ed3c73014aae1b542.tar.gz |
lua: Making lua building with no gcc error
Simple patch to make gcc happy during build in -Wall -Werror
Diffstat (limited to 'com32/lua')
-rw-r--r-- | com32/lua/src/Makefile | 2 | ||||
-rw-r--r-- | com32/lua/src/syslinux.c | 25 |
2 files changed, 15 insertions, 12 deletions
diff --git a/com32/lua/src/Makefile b/com32/lua/src/Makefile index d31c9bdc..72f31688 100644 --- a/com32/lua/src/Makefile +++ b/com32/lua/src/Makefile @@ -22,7 +22,7 @@ LIBS = ../../lib/libcom32.a $(LIBGCC) LNXLIBS = # Temporarily allow warnings not being treated as errors -GCCWARN += -Wno-error +#GCCWARN += -Wno-error MODULES = lua.c32 TESTFILES = diff --git a/com32/lua/src/syslinux.c b/com32/lua/src/syslinux.c index fa54d7f1..f47f888c 100644 --- a/com32/lua/src/syslinux.c +++ b/com32/lua/src/syslinux.c @@ -153,6 +153,8 @@ static int sl_run_command(lua_State * L) /* do default boot */ static int sl_run_default(lua_State * L) { + /* Preventing GCC to complain against unused L */ + L=L; syslinux_run_default(); return 0; } @@ -321,7 +323,7 @@ static int sl_loadfile(lua_State * L) } file = malloc(sizeof(syslinux_file)); - file->name = filename; + strlcpy(file->name,filename,sizeof(syslinux_file)); file->size = file_len; file->data = file_data; @@ -367,7 +369,7 @@ static int sl_initramfs_init(lua_State * L) static int sl_initramfs_load_archive(lua_State * L) { - const struct initramfs *initramfs = luaL_checkudata(L, 1, SYSLINUX_FILE); + struct initramfs *initramfs = luaL_checkudata(L, 1, SYSLINUX_FILE); const char *filename = luaL_checkstring(L, 2); if (initramfs_load_archive(initramfs, filename)) { @@ -379,27 +381,28 @@ static int sl_initramfs_load_archive(lua_State * L) static int sl_initramfs_add_file(lua_State * L) { - const struct initramfs *initramfs = luaL_checkudata(L, 1, SYSLINUX_FILE); - const char *filename = luaL_checkstring(L, 2); - void *file_data; + struct initramfs *initramfs = luaL_checkudata(L, 1, SYSLINUX_FILE); + /* FIXME: This code is doing nothing */ + //const char *filename = luaL_checkstring(L, 2); + void *file_data = NULL; size_t file_len = 0; - if (initramfs_add_file(initramfs, file_data, file_len, file_len, - "/testfile1", 0, 0755)) - - return 0; + return initramfs_add_file(initramfs, file_data, file_len, file_len, "/testfile1", 0, 0755); } static int sl_boot_it(lua_State * L) { const syslinux_file *kernel = luaL_checkudata(L, 1, SYSLINUX_FILE); - const struct initramfs *initramfs = luaL_checkudata(L, 2, SYSLINUX_FILE); + struct initramfs *initramfs = luaL_checkudata(L, 2, SYSLINUX_FILE); const char *cmdline = luaL_optstring(L, 3, ""); uint32_t mem_limit = luaL_optint(L, 4, 0); uint16_t video_mode = luaL_optint(L, 5, 0); int ret; + /* Preventing gcc to complain about unused variables */ + video_mode=video_mode; + mem_limit=mem_limit; - ret = syslinux_boot_linux(kernel->data, kernel->size, initramfs, cmdline); + ret = syslinux_boot_linux(kernel->data, kernel->size, initramfs, (char *)cmdline); return 0; } |