commit 338426282707ba6678a1712f8ba1a1c43e5eb56a
author Leandro Pereira <leandro.pereira@intel.com> Tue Sep 05 16:30:17 2017 -0700
committer Anas Nashif <nashif@linux.intel.com> Thu Sep 07 05:49:17 2017 -0500
tree fbba361ede8b9910f5faba1da7e106ad5f53a24a
parent d66069d051ee2efff2aa0821cb812aca491b5bff

lib: json: Fix compilation warnings

This appears to be a bug in GCC: when an anonymous union contains
anonymous structs, GCC issues a warning that a field in one of the
anonymous structs has not been initialized.  Fix by making the
structs not anonymous.

Signed-off-by: Leandro Pereira <leandro.pereira@intel.com>

lib/json/json.c

diff --git a/lib/json/json.c b/lib/json/json.c
index 39c4691..411a708 100644
--- a/lib/json/json.c
+++ b/lib/json/json.c
@@ -441,12 +441,12 @@
 
 	switch (descr->type) {
 	case JSON_TOK_OBJECT_START:
-		return obj_parse(obj, descr->sub_descr,
-				 descr->sub_descr_len,
+		return obj_parse(obj, descr->object.sub_descr,
+				 descr->object.sub_descr_len,
 				 field);
 	case JSON_TOK_LIST_START:
-		return arr_parse(obj, descr->element_descr,
-				 descr->n_elements, field, val);
+		return arr_parse(obj, descr->array.element_descr,
+				 descr->array.n_elements, field, val);
 	case JSON_TOK_FALSE:
 	case JSON_TOK_TRUE: {
 		bool *v = field;
@@ -484,13 +484,13 @@
 	case JSON_TOK_FALSE:
 		return sizeof(bool);
 	case JSON_TOK_LIST_START:
-		return descr->n_elements * get_elem_size(descr->element_descr);
+		return descr->array.n_elements * get_elem_size(descr->array.element_descr);
 	case JSON_TOK_OBJECT_START: {
 		ptrdiff_t total = 0;
 		size_t i;
 
 		for (i = 0; i < descr->sub_descr_len; i++) {
-			total += get_elem_size(&descr->sub_descr[i]);
+			total += get_elem_size(&descr->object.sub_descr[i]);
 		}
 
 		return total;
@@ -809,11 +809,11 @@
 	case JSON_TOK_STRING:
 		return str_encode(ptr, append_bytes, data);
 	case JSON_TOK_LIST_START:
-		return arr_encode(descr->element_descr, ptr,
+		return arr_encode(descr->array.element_descr, ptr,
 				  val, append_bytes, data);
 	case JSON_TOK_OBJECT_START:
-		return json_obj_encode(descr->sub_descr,
-				       descr->sub_descr_len,
+		return json_obj_encode(descr->object.sub_descr,
+				       descr->object.sub_descr_len,
 				       ptr, append_bytes, data);
 	case JSON_TOK_NUMBER:
 		return num_encode(ptr, append_bytes, data);