#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"
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;
- }
+ bt_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) {
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) {
+ bt_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;
switch (node->type) {
case NODE_ROOT:
- cds_list_for_each_entry(iter, &node->u.root.declaration_list, siblings) {
+ bt_list_for_each_entry(iter, &node->u.root.declaration_list, siblings) {
+ iter->parent = node;
+ ret = ctf_visitor_parent_links(fd, depth + 1, iter);
+ if (ret)
+ return ret;
+ }
+ bt_list_for_each_entry(iter, &node->u.root.trace, 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.root.trace, siblings) {
+ bt_list_for_each_entry(iter, &node->u.root.stream, 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.root.stream, siblings) {
+ bt_list_for_each_entry(iter, &node->u.root.event, 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.root.event, siblings) {
+ bt_list_for_each_entry(iter, &node->u.root.clock, siblings) {
iter->parent = node;
ret = ctf_visitor_parent_links(fd, depth + 1, iter);
if (ret)
break;
case NODE_EVENT:
- cds_list_for_each_entry(iter, &node->u.event.declaration_list, siblings) {
+ bt_list_for_each_entry(iter, &node->u.event.declaration_list, siblings) {
iter->parent = node;
ret = ctf_visitor_parent_links(fd, depth + 1, iter);
if (ret)
}
break;
case NODE_STREAM:
- cds_list_for_each_entry(iter, &node->u.stream.declaration_list, siblings) {
+ bt_list_for_each_entry(iter, &node->u.stream.declaration_list, siblings) {
+ iter->parent = node;
+ ret = ctf_visitor_parent_links(fd, depth + 1, iter);
+ if (ret)
+ return ret;
+ }
+ break;
+ case NODE_ENV:
+ bt_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)
}
break;
case NODE_TRACE:
- cds_list_for_each_entry(iter, &node->u.trace.declaration_list, siblings) {
+ bt_list_for_each_entry(iter, &node->u.trace.declaration_list, siblings) {
+ iter->parent = node;
+ ret = ctf_visitor_parent_links(fd, depth + 1, iter);
+ if (ret)
+ return ret;
+ }
+ break;
+ case NODE_CLOCK:
+ bt_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)
case NODE_CTF_EXPRESSION:
depth++;
- cds_list_for_each_entry(iter, &node->u.ctf_expression.left, siblings) {
+ bt_list_for_each_entry(iter, &node->u.ctf_expression.left, 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.ctf_expression.right, siblings) {
+ bt_list_for_each_entry(iter, &node->u.ctf_expression.right, siblings) {
iter->parent = node;
ret = ctf_visitor_parent_links(fd, depth + 1, iter);
if (ret)
ret = ctf_visitor_parent_links(fd, depth + 1, node->u._typedef.type_specifier_list);
if (ret)
return ret;
- cds_list_for_each_entry(iter, &node->u._typedef.type_declarators, siblings) {
+ bt_list_for_each_entry(iter, &node->u._typedef.type_declarators, siblings) {
iter->parent = node;
ret = ctf_visitor_parent_links(fd, depth + 1, iter);
if (ret)
ret = ctf_visitor_parent_links(fd, depth + 1, node->u.typealias_target.type_specifier_list);
if (ret)
return ret;
- cds_list_for_each_entry(iter, &node->u.typealias_target.type_declarators, siblings) {
+ bt_list_for_each_entry(iter, &node->u.typealias_target.type_declarators, siblings) {
iter->parent = node;
ret = ctf_visitor_parent_links(fd, depth + 1, iter);
if (ret)
ret = ctf_visitor_parent_links(fd, depth + 1, node->u.typealias_alias.type_specifier_list);
if (ret)
return ret;
- cds_list_for_each_entry(iter, &node->u.typealias_alias.type_declarators, siblings) {
+ bt_list_for_each_entry(iter, &node->u.typealias_alias.type_declarators, siblings) {
iter->parent = node;
ret = ctf_visitor_parent_links(fd, depth + 1, iter);
if (ret)
break;
case NODE_TYPE_SPECIFIER_LIST:
- cds_list_for_each_entry(iter, &node->u.type_specifier_list.head, siblings) {
+ bt_list_for_each_entry(iter, &node->u.type_specifier_list.head, siblings) {
iter->parent = node;
ret = ctf_visitor_parent_links(fd, depth + 1, iter);
if (ret)
break;
case NODE_FLOATING_POINT:
- cds_list_for_each_entry(iter, &node->u.floating_point.expressions, siblings) {
+ bt_list_for_each_entry(iter, &node->u.floating_point.expressions, siblings) {
iter->parent = node;
ret = ctf_visitor_parent_links(fd, depth + 1, iter);
if (ret)
}
break;
case NODE_INTEGER:
- cds_list_for_each_entry(iter, &node->u.integer.expressions, siblings) {
+ bt_list_for_each_entry(iter, &node->u.integer.expressions, siblings) {
iter->parent = node;
ret = ctf_visitor_parent_links(fd, depth + 1, iter);
if (ret)
}
break;
case NODE_STRING:
- cds_list_for_each_entry(iter, &node->u.string.expressions, siblings) {
+ bt_list_for_each_entry(iter, &node->u.string.expressions, siblings) {
iter->parent = node;
ret = ctf_visitor_parent_links(fd, depth + 1, iter);
if (ret)
}
break;
case NODE_ENUMERATOR:
- cds_list_for_each_entry(iter, &node->u.enumerator.values, siblings) {
+ bt_list_for_each_entry(iter, &node->u.enumerator.values, 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._enum.enumerator_list, siblings) {
+ bt_list_for_each_entry(iter, &node->u._enum.enumerator_list, siblings) {
iter->parent = node;
ret = ctf_visitor_parent_links(fd, depth + 1, iter);
if (ret)
node->u.struct_or_variant_declaration.type_specifier_list);
if (ret)
return ret;
- cds_list_for_each_entry(iter, &node->u.struct_or_variant_declaration.type_declarators, siblings) {
+ bt_list_for_each_entry(iter, &node->u.struct_or_variant_declaration.type_declarators, siblings) {
iter->parent = node;
ret = ctf_visitor_parent_links(fd, depth + 1, iter);
if (ret)
}
break;
case NODE_VARIANT:
- cds_list_for_each_entry(iter, &node->u.variant.declaration_list, siblings) {
+ bt_list_for_each_entry(iter, &node->u.variant.declaration_list, siblings) {
iter->parent = node;
ret = ctf_visitor_parent_links(fd, depth + 1, iter);
if (ret)
}
break;
case NODE_STRUCT:
- cds_list_for_each_entry(iter, &node->u._struct.declaration_list, siblings) {
+ bt_list_for_each_entry(iter, &node->u._struct.declaration_list, siblings) {
+ iter->parent = node;
+ ret = ctf_visitor_parent_links(fd, depth + 1, iter);
+ if (ret)
+ return ret;
+ }
+ bt_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)