X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=formats%2Fctf%2Fmetadata%2Fctf-visitor-parent-links.c;h=821083ebd1e77bff1a607f7f7cf1d21dc1ac926c;hb=82ace6d6d97ecb15d093232c76c5d4a3c31e6948;hp=9337dd49b832e9a053f568d6f3b96887ba04bd23;hpb=3e11b713fa76482be45bff5b067cfab5ab6e9be1;p=babeltrace.git

diff --git a/formats/ctf/metadata/ctf-visitor-parent-links.c b/formats/ctf/metadata/ctf-visitor-parent-links.c
index 9337dd49..821083eb 100644
--- a/formats/ctf/metadata/ctf-visitor-parent-links.c
+++ b/formats/ctf/metadata/ctf-visitor-parent-links.c
@@ -24,6 +24,7 @@
 #include <glib.h>
 #include <inttypes.h>
 #include <errno.h>
+#include <babeltrace/babeltrace-internal.h>
 #include <babeltrace/list.h>
 #include "ctf-scanner.h"
 #include "ctf-parser.h"
@@ -127,14 +128,12 @@ int ctf_visitor_type_declarator(FILE *fd, int depth, struct ctf_node *node)
 
 	depth++;
 
-	if (!cds_list_empty(&node->u.type_declarator.pointers)) {
-		cds_list_for_each_entry(iter, &node->u.type_declarator.pointers,
-					siblings) {
-			iter->parent = node;
-			ret = ctf_visitor_parent_links(fd, depth + 1, iter);
-			if (ret)
-				return ret;
-		}
+	cds_list_for_each_entry(iter, &node->u.type_declarator.pointers,
+				siblings) {
+		iter->parent = node;
+		ret = ctf_visitor_parent_links(fd, depth + 1, iter);
+		if (ret)
+			return ret;
 	}
 
 	switch (node->u.type_declarator.type) {
@@ -148,11 +147,14 @@ 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);
-			if (ret)
-				return ret;
+		if (!node->u.type_declarator.u.nested.abstract_array) {
+			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;
+			}
 		}
 		if (node->u.type_declarator.bitfield_len) {
 			node->u.type_declarator.bitfield_len = node;
@@ -203,6 +205,12 @@ int ctf_visitor_parent_links(FILE *fd, int depth, struct ctf_node *node)
 			if (ret)
 				return ret;
 		}
+		cds_list_for_each_entry(iter, &node->u.root.clock, siblings) {
+			iter->parent = node;
+			ret = ctf_visitor_parent_links(fd, depth + 1, iter);
+			if (ret)
+				return ret;
+		}
 		break;
 
 	case NODE_EVENT:
@@ -221,6 +229,14 @@ int ctf_visitor_parent_links(FILE *fd, int depth, struct ctf_node *node)
 				return ret;
 		}
 		break;
+	case NODE_ENV:
+		cds_list_for_each_entry(iter, &node->u.env.declaration_list, siblings) {
+			iter->parent = node;
+			ret = ctf_visitor_parent_links(fd, depth + 1, iter);
+			if (ret)
+				return ret;
+		}
+		break;
 	case NODE_TRACE:
 		cds_list_for_each_entry(iter, &node->u.trace.declaration_list, siblings) {
 			iter->parent = node;
@@ -229,6 +245,14 @@ int ctf_visitor_parent_links(FILE *fd, int depth, struct ctf_node *node)
 				return ret;
 		}
 		break;
+	case NODE_CLOCK:
+		cds_list_for_each_entry(iter, &node->u.clock.declaration_list, siblings) {
+			iter->parent = node;
+			ret = ctf_visitor_parent_links(fd, depth + 1, iter);
+			if (ret)
+				return ret;
+		}
+		break;
 
 	case NODE_CTF_EXPRESSION:
 		depth++;
@@ -358,9 +382,11 @@ int ctf_visitor_parent_links(FILE *fd, int depth, struct ctf_node *node)
 		break;
 	case NODE_ENUM:
 		depth++;
-		ret = ctf_visitor_parent_links(fd, depth + 1, node->u._enum.container_type);
-		if (ret)
-			return ret;
+		if (node->u._enum.container_type) {
+			ret = ctf_visitor_parent_links(fd, depth + 1, node->u._enum.container_type);
+			if (ret)
+				return ret;
+		}
 
 		cds_list_for_each_entry(iter, &node->u._enum.enumerator_list, siblings) {
 			iter->parent = node;
@@ -398,6 +424,13 @@ int ctf_visitor_parent_links(FILE *fd, int depth, struct ctf_node *node)
 			if (ret)
 				return ret;
 		}
+		cds_list_for_each_entry(iter, &node->u._struct.min_align,
+					siblings) {
+			iter->parent = node;
+			ret = ctf_visitor_parent_links(fd, depth + 1, iter);
+			if (ret)
+				return ret;
+		}
 		break;
 
 	case NODE_UNKNOWN: