Create "untagged" variant structure

[babeltrace.git] / formats / ctf / metadata / ctf-visitor-generate-io-struct.c

diff --git a/formats/ctf/metadata/ctf-visitor-generate-io-struct.c b/formats/ctf/metadata/ctf-visitor-generate-io-struct.c
index 2c01a9a2510bbf2087daa45ff53588549e256af3..1a3fe585c7c1851c2d4b27f8f0e0b63ece073281 100644 (file)
--- a/formats/ctf/metadata/ctf-visitor-generate-io-struct.c
+++ b/formats/ctf/metadata/ctf-visitor-generate-io-struct.c
@@ -517,7 +517,7 @@ int ctf_event_visit(FILE *fd, int depth, struct ctf_node *node,
                                parent_def_scope, 0, 0);
                set_dynamic_definition_scope(&event->context->p,
                                             event->context->scope,
-                                            g_quark_from_string("event.context"));
+                                            "event.context");
                parent_def_scope = event->context->scope;
                declaration_unref(event->context_decl);
        }
@@ -527,7 +527,7 @@ int ctf_event_visit(FILE *fd, int depth, struct ctf_node *node,
                                parent_def_scope, 0, 0);
                set_dynamic_definition_scope(&event->fields->p,
                                             event->fields->scope,
-                                            g_quark_from_string("event.fields"));
+                                            "event.fields");
                parent_def_scope = event->fields->scope;
                declaration_unref(event->fields_decl);
        }
@@ -656,7 +656,7 @@ int ctf_stream_visit(FILE *fd, int depth, struct ctf_node *node,
                                parent_def_scope, 0, 0);
                set_dynamic_definition_scope(&stream->packet_context->p,
                                             stream->packet_context->scope,
-                                            g_quark_from_string("stream.packet.context"));
+                                            "stream.packet.context");
                parent_def_scope = stream->packet_context->scope;
                declaration_unref(stream->packet_context_decl);
        }
@@ -666,7 +666,7 @@ int ctf_stream_visit(FILE *fd, int depth, struct ctf_node *node,
                                parent_def_scope, 0, 0);
                set_dynamic_definition_scope(&stream->event_header->p,
                                             stream->event_header->scope,
-                                            g_quark_from_string("stream.event.header"));
+                                            "stream.event.header");
                parent_def_scope = stream->event_header->scope;
                declaration_unref(stream->event_header_decl);
        }
@@ -676,7 +676,7 @@ int ctf_stream_visit(FILE *fd, int depth, struct ctf_node *node,
                                parent_def_scope, 0, 0);
                set_dynamic_definition_scope(&stream->event_context->p,
                                             stream->event_context->scope,
-                                            g_quark_from_string("stream.event.context"));
+                                            "stream.event.context");
                parent_def_scope = stream->event_context->scope;
                declaration_unref(stream->event_context_decl);
        }
@@ -824,7 +824,7 @@ int _ctf_visitor(FILE *fd, int depth, struct ctf_node *node, struct ctf_trace *t
                        ret = ctf_typedef_visit(fd, depth + 1,
                                                &iter->u._typedef.declaration_specifier,
                                                &iter->u._typedef.type_declarators,
-                                               trace->declaration_scope);
+                                               trace->root_declaration_scope);
                        if (ret)
                                return ret;
                }
@@ -832,7 +832,7 @@ int _ctf_visitor(FILE *fd, int depth, struct ctf_node *node, struct ctf_trace *t
                                        siblings) {
                        ret = ctf_typealias_visit(fd, depth + 1,
                                        &iter->u.typealias.target, &iter->u.typealias.alias
-                                       trace->declaration_scope);
+                                       trace->root_declaration_scope);
                        if (ret)
                                return ret;
                }