X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Fctf%2Fmetadata%2Fctf-visitor-parent-links.c;h=8c4b2124c73d3fd8a34dd42015b774a68439b625;hp=99d1ca044b4062f2a1e839ad77dd6eac795eda72;hb=7d4192cb80178ad534e460d56f67e55679c7d8ee;hpb=34f7b02c8e97da51ff316e802160d17d2a418d87

diff --git a/formats/ctf/metadata/ctf-visitor-parent-links.c b/formats/ctf/metadata/ctf-visitor-parent-links.c
index 99d1ca04..8c4b2124 100644
--- a/formats/ctf/metadata/ctf-visitor-parent-links.c
+++ b/formats/ctf/metadata/ctf-visitor-parent-links.c
@@ -92,6 +92,7 @@ int ctf_visitor_type_specifier(FILE *fd, int depth, struct ctf_node *node)
 	case TYPESPEC_UNSIGNED:
 	case TYPESPEC_BOOL:
 	case TYPESPEC_COMPLEX:
+	case TYPESPEC_IMAGINARY:
 	case TYPESPEC_CONST:
 	case TYPESPEC_ID_TYPE:
 		break;
@@ -134,10 +135,10 @@ int ctf_visitor_type_declarator(FILE *fd, int depth, struct ctf_node *node)
 			if (ret)
 				return ret;
 		}
-		if (node->u.type_declarator.u.nested.length) {
-			node->u.type_declarator.u.nested.length->parent = node;
-			ret = ctf_visitor_parent_links(fd, depth + 1,
-				node->u.type_declarator.u.nested.length);
+		cds_list_for_each_entry(iter, &node->u.type_declarator.u.nested.length,
+					siblings) {
+			iter->parent = node;
+			ret = ctf_visitor_parent_links(fd, depth + 1, iter);
 			if (ret)
 				return ret;
 		}
@@ -357,9 +358,10 @@ int ctf_visitor_parent_links(FILE *fd, int depth, struct ctf_node *node)
 	case NODE_ENUM:
 		depth++;
 
-		if (node->u._enum.container_type) {
-			node->u._enum.container_type->parent = node;
-			ret = ctf_visitor_parent_links(fd, depth + 1, node->u._enum.container_type);
+		cds_list_for_each_entry(iter, &node->u._enum.container_type,
+					siblings) {
+			iter->parent = node;
+			ret = ctf_visitor_parent_links(fd, depth + 1, iter);
 			if (ret)
 				return ret;
 		}