summaryrefslogtreecommitdiff
path: root/lua
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2011-11-12 15:16:31 +0100
committerJo-Philipp Wich <jow@openwrt.org>2011-11-12 15:16:31 +0100
commit359c5c4dcc087413fc01b75a688d7a9c6d4b1c1b (patch)
treed47d4413d6b40c86375bd0e245e5db5a661e81a1 /lua
parentdc47efacd6bbeabb378b68525391dda2b20ce175 (diff)
downloaduci-359c5c4dcc087413fc01b75a688d7a9c6d4b1c1b.tar.gz
lua: simplify add_list changes handling, always create a table for LIST_ADD commands
Diffstat (limited to 'lua')
-rw-r--r--lua/uci.c24
1 files changed, 11 insertions, 13 deletions
diff --git a/lua/uci.c b/lua/uci.c
index ac04c11..cc6f370 100644
--- a/lua/uci.c
+++ b/lua/uci.c
@@ -711,20 +711,18 @@ uci_lua_add_change(lua_State *L, struct uci_element *e)
if (name) {
lua_getfield(L, -1, name);
- /* there seems to be no value yet so simply push it as string */
+ /* there seems to be no value yet */
if (lua_isnil(L, -1)) {
- lua_pushstring(L, value);
- lua_setfield(L, -3, name);
-
- /* there is already a value, so this change is a list_add,
- * coerce string into one-element array and append new value */
- } else if (lua_isstring(L, -1)) {
- lua_newtable(L);
- lua_pushvalue(L, -2);
- lua_rawseti(L, -2, 1);
- lua_pushstring(L, value);
- lua_rawseti(L, -2, 2);
- lua_setfield(L, -3, name);
+ /* this delta is a list add operation, initialize table */
+ if (h->cmd == UCI_CMD_LIST_ADD) {
+ lua_newtable(L);
+ lua_pushstring(L, value);
+ lua_rawseti(L, -2, 1);
+ lua_setfield(L, -3, name);
+ } else {
+ lua_pushstring(L, value);
+ lua_setfield(L, -3, name);
+ }
/* a table is on the top of the stack so this is a subsequent,
* list_add, append this value to table */