lua: allow overriding of LUA_CFLAGS

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

diff --git a/lua/uci.c b/lua/uci.c
index efa8c1a..67ec671 100644 (file)
--- a/lua/uci.c
+++ b/lua/uci.c
@@ -266,7 +266,7 @@ uci_lua_foreach(lua_State *L)
 {
        struct uci_context *ctx;
        struct uci_package *p;
-       struct uci_element *e;
+       struct uci_element *e, *tmp;
        const char *package, *type;
        bool ret = false;
        int offset = 0;
@@ -287,7 +287,7 @@ uci_lua_foreach(lua_State *L)
        if (!p)
                goto done;
 
-       uci_foreach_element(&p->sections, e) {
+       uci_foreach_element_safe(&p->sections, tmp, e) {
                struct uci_section *s = uci_to_section(e);
 
                i++;
@@ -418,14 +418,13 @@ uci_lua_delete(lua_State *L)
        struct uci_ptr ptr;
        int offset = 0;
        char *s = NULL;
-       int err = UCI_ERR_NOTFOUND;
 
        ctx = find_context(L, &offset);
 
        if (lookup_args(L, ctx, offset, &ptr, &s))
                goto error;
 
-       err = uci_delete(ctx, &ptr);
+       uci_delete(ctx, &ptr);
 
 error:
        if (s)
@@ -627,7 +626,6 @@ uci_lua_package_cmd(lua_State *L, enum pkg_cmd cmd)
        struct uci_element *e, *tmp;
        struct uci_ptr ptr;
        char *s = NULL;
-       int failed = 0;
        int nargs, offset = 0;
 
        ctx = find_context(L, &offset);
@@ -642,7 +640,6 @@ uci_lua_package_cmd(lua_State *L, enum pkg_cmd cmd)
 
        uci_foreach_element_safe(&ctx->root, tmp, e) {
                struct uci_package *p = uci_to_package(e);
-               int ret = UCI_ERR_INVAL;
 
                if (ptr.p && (ptr.p != p))
                        continue;
@@ -650,18 +647,15 @@ uci_lua_package_cmd(lua_State *L, enum pkg_cmd cmd)
                ptr.p = p;
                switch(cmd) {
                case CMD_COMMIT:
-                       ret = uci_commit(ctx, &p, false);
+                       uci_commit(ctx, &p, false);
                        break;
                case CMD_SAVE:
-                       ret = uci_save(ctx, p);
+                       uci_save(ctx, p);
                        break;
                case CMD_REVERT:
-                       ret = uci_revert(ctx, &ptr);
+                       uci_revert(ctx, &ptr);
                        break;
                }
-
-               if (ret != 0)
-                       failed = 1;
        }
 
 err:
@@ -793,11 +787,11 @@ static int
 uci_lua_set_confdir(lua_State *L)
 {
        struct uci_context *ctx;
-       int ret, offset = 0;
+       int offset = 0;
 
        ctx = find_context(L, &offset);
        luaL_checkstring(L, 1 + offset);
-       ret = uci_set_confdir(ctx, lua_tostring(L, -1));
+       uci_set_confdir(ctx, lua_tostring(L, -1));
        return uci_push_status(L, ctx, false);
 }
 
@@ -813,11 +807,11 @@ static int
 uci_lua_add_delta(lua_State *L)
 {
        struct uci_context *ctx;
-       int ret, offset = 0;
+       int offset = 0;
 
        ctx = find_context(L, &offset);
        luaL_checkstring(L, 1 + offset);
-       ret = uci_add_delta_path(ctx, lua_tostring(L, -1));
+       uci_add_delta_path(ctx, lua_tostring(L, -1));
        return uci_push_status(L, ctx, false);
 }
 
@@ -825,13 +819,13 @@ static int
 uci_lua_load_plugins(lua_State *L)
 {
        struct uci_context *ctx;
-       int ret, offset = 0;
+       int offset = 0;
        const char *str = NULL;
 
        ctx = find_context(L, &offset);
        if (lua_isstring(L, -1))
                str = lua_tostring(L, -1);
-       ret = uci_load_plugins(ctx, str);
+       uci_load_plugins(ctx, str);
        return uci_push_status(L, ctx, false);
 }
 
@@ -839,11 +833,11 @@ static int
 uci_lua_set_savedir(lua_State *L)
 {
        struct uci_context *ctx;
-       int ret, offset = 0;
+       int offset = 0;
 
        ctx = find_context(L, &offset);
        luaL_checkstring(L, 1 + offset);
-       ret = uci_set_savedir(ctx, lua_tostring(L, -1));
+       uci_set_savedir(ctx, lua_tostring(L, -1));
        return uci_push_status(L, ctx, false);
 }
 
@@ -902,6 +896,7 @@ static const luaL_Reg uci[] = {
        { "reorder", uci_lua_reorder },
        { "changes", uci_lua_changes },
        { "foreach", uci_lua_foreach },
+       { "add_history", uci_lua_add_delta },
        { "add_delta", uci_lua_add_delta },
        { "load_plugins", uci_lua_load_plugins },
        { "get_confdir", uci_lua_get_confdir },