[syslinux:master] lua: make the dmi module standalone

syslinux-bot for Ferenc Wágner wferi at niif.hu
Sun Mar 2 13:48:26 PST 2014


Commit-ID:  7c01256715ea611da8ad47c135ae41f5dd54f9e3
Gitweb:     http://www.syslinux.org/commit/7c01256715ea611da8ad47c135ae41f5dd54f9e3
Author:     Ferenc Wágner <wferi at niif.hu>
AuthorDate: Mon, 14 Oct 2013 19:57:57 +0200
Committer:  Ferenc Wágner <wferi at niif.hu>
CommitDate: Sat, 1 Mar 2014 17:40:35 +0100

lua: make the dmi module standalone

By copying two short functions from the cpu module.
They do not warrant a separate module.
Also make those functions static in both modules.

---
 com32/lua/src/cpu.c |  4 ++--
 com32/lua/src/dmi.c | 14 ++++++++++++--
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/com32/lua/src/cpu.c b/com32/lua/src/cpu.c
index 69914f7..2e822cd 100644
--- a/com32/lua/src/cpu.c
+++ b/com32/lua/src/cpu.c
@@ -9,13 +9,13 @@
 #include"lualib.h"
 #include"cpuid.h"
 
-void add_string_item(lua_State *L, const char *item, const char *value_str) {
+static void add_string_item(lua_State *L, const char *item, const char *value_str) {
  lua_pushstring(L,item);
  lua_pushstring(L,value_str);
  lua_settable(L,-3);
 }
 
-void add_int_item(lua_State *L, const char *item, int value_int) {
+static void add_int_item(lua_State *L, const char *item, int value_int) {
  lua_pushstring(L,item);
  lua_pushnumber(L,value_int);
  lua_settable(L,-3);
diff --git a/com32/lua/src/dmi.c b/com32/lua/src/dmi.c
index aa38df3..f4755e8 100644
--- a/com32/lua/src/dmi.c
+++ b/com32/lua/src/dmi.c
@@ -9,8 +9,18 @@
 #include "lualib.h"
 #include "dmi/dmi.h"
 
-extern void add_string_item(lua_State*, const char*, const char*);
-extern void add_int_item(lua_State*, const char*, int);
+static void add_string_item(lua_State *L, const char *item, const char *value_str) {
+ lua_pushstring(L,item);
+ lua_pushstring(L,value_str);
+ lua_settable(L,-3);
+}
+
+static void add_int_item(lua_State *L, const char *item, int value_int) {
+ lua_pushstring(L,item);
+ lua_pushnumber(L,value_int);
+ lua_settable(L,-3);
+}
+
 typedef int (*table_fn)(lua_State*, s_dmi*);
 
 /* Add a Lua_String entry to the table on stack


More information about the Syslinux-commits mailing list