From 1a0abb3036452852757d13fe394c6c72dff877bd Mon Sep 17 00:00:00 2001 From: Ana Rey Date: Wed, 9 Apr 2014 11:16:19 +0200 Subject: xml, json: Delete a cmpdata label in xml and json file It delete the cmpdata label in the structure of json and xml file. Example of xmlfile: The old structure of xml file: [...] 1 eq 4 0x0100a8c0 The new structure of json file: [...] 1 eq 4 0x0100a8c0 [...] To generate the new testfiles, It use the option -u of nft-parsing-test script. Signed-off-by: Ana Rey Signed-off-by: Pablo Neira Ayuso --- src/jansson.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'src/jansson.c') diff --git a/src/jansson.c b/src/jansson.c index 5107eb5..affe8fe 100644 --- a/src/jansson.c +++ b/src/jansson.c @@ -215,13 +215,10 @@ int nft_jansson_data_reg_parse(json_t *root, const char *node_name, json_t *data; int ret; + /* It is necessary for the compatibility with cmpdata label. */ data = json_object_get(root, node_name); - if (data == NULL) { - err->error = NFT_PARSE_EMISSINGNODE; - err->node_name = node_name; - errno = EINVAL; - return -1; - } + if (data == NULL) + data = root; data = json_object_get(data, "data_reg"); if (data == NULL) { -- cgit v1.2.3