Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

luci-lib-jsonc: allow encoding empty lists

Browse source 
To be consistent with the behavior of luci-lib-json, an empty Lua table
should be encoded to an empty JSON list, not an empty JSON object.

To still allow encoding empty JSON objects, the usage of anything other
than a number or a string as a key (for example an empty table or a
function) can be used to force encoding as an object:

    json.stringify({})                  -- "[]"
    json.stringify({[{}] = true})       -- "{}"

Signed-off-by: Jan-Philipp Litza <janphilipp@litza.de>
This commit is contained in:
Jan-Philipp Litza 2015-08-30 15:45:49 +02:00
parent e32a877aa4
commit e7645d557c
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libs/luci-lib-jsonc/src/jsonc.c
View file

@ -222,7 +222,7 @@ static int _lua_test_array(lua_State *L, int index)
out: out:
lua_pop(L, 2); lua_pop(L, 2);
return 0; return -1;
} }
/* check for holes */ /* check for holes */
@ -254,7 +254,7 @@ static struct json_object * _lua_to_json(lua_State *L, int index)
case LUA_TTABLE: case LUA_TTABLE:
max = _lua_test_array(L, index); max = _lua_test_array(L, index);
if (max > 0) if (max >= 0)
{ {
obj = json_object_new_array(); obj = json_object_new_array();