use the correct soname for libuci

[project/uci.git] / lua / uci.c

diff --git a/lua/uci.c b/lua/uci.c
index f2be5d5..e3a1334 100644 (file)
--- a/lua/uci.c
+++ b/lua/uci.c
@@ -94,20 +94,15 @@ static void uci_push_section(lua_State *L, struct uci_section *s)
 
        lua_newtable(L);
        lua_pushstring(L, s->type);
-       lua_setfield(L, -2, "type");
+       lua_setfield(L, -2, ".type");
        lua_pushstring(L, s->e.name);
-       lua_setfield(L, -2, "name");
-
-       lua_newtable(L);
-       lua_pushvalue(L, -1);
-       lua_setfield(L, -3, "options");
+       lua_setfield(L, -2, ".name");
 
        uci_foreach_element(&s->options, e) {
                struct uci_option *o = uci_to_option(e);
                lua_pushstring(L, o->value);
                lua_setfield(L, -2, o->e.name);
        }
-       lua_pop(L, 1);
 }
 
 static void uci_push_package(lua_State *L, struct uci_package *p)
@@ -118,9 +113,8 @@ static void uci_push_package(lua_State *L, struct uci_package *p)
        lua_newtable(L);
        uci_foreach_element(&p->sections, e) {
                i++;
-               luaL_setn(L, -1, i);
                uci_push_section(L, uci_to_section(e));
-               lua_rawseti(L, -2, i);
+               lua_setfield(L, -2, e->name);
        }
 }
 
@@ -534,12 +528,12 @@ uci_lua_add_change(lua_State *L, struct uci_element *e)
        lua_getfield(L, -1, h->section);
        if (lua_isnil(L, -1)) {
                lua_pop(L, 1);
-               lua_createtable(L, 0, 0);
+               lua_newtable(L);
                lua_pushvalue(L, -1); /* copy for setfield */
                lua_setfield(L, -3, h->section);
        }
 
-       name = (h->e.name ? h->e.name : ".TYPE");
+       name = (h->e.name ? h->e.name : ".type");
        if (h->value)
                lua_pushstring(L, h->value);
        else
@@ -566,7 +560,7 @@ uci_lua_changes_pkg(lua_State *L, const char *package)
        if (uci_list_empty(&p->history) && uci_list_empty(&p->saved_history))
                goto done;
 
-       lua_createtable(L, 0, 0);
+       lua_newtable(L);
        uci_foreach_element(&p->saved_history, e) {
                uci_lua_add_change(L, e);
        }
@@ -598,7 +592,7 @@ uci_lua_changes(lua_State *L)
                luaL_error(L, "invalid argument count");
        }
 
-       lua_createtable(L, 0, 0);
+       lua_newtable(L);
        if (package) {
                uci_lua_changes_pkg(L, package);
        } else {