namespace the sequence functions

[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 9693345649b5d68e6f9c437a1480baba41919960..94dd0c83dfb45a7980475772c16d0f77de2b30cc 100644 (file)
--- a/formats/ctf/metadata/ctf-visitor-generate-io-struct.c
+++ b/formats/ctf/metadata/ctf-visitor-generate-io-struct.c
@@ -526,7 +526,7 @@ struct declaration *ctf_type_declarator_visit(FILE *fd, int depth,
                        char *length_name = concatenate_unary_strings(&node_type_declarator->u.type_declarator.u.nested.length);
                        struct declaration_sequence *sequence_declaration;
 
-                       sequence_declaration = sequence_declaration_new(length_name, nested_declaration, declaration_scope);
+                       sequence_declaration = bt_sequence_declaration_new(length_name, nested_declaration, declaration_scope);
                        if (!sequence_declaration) {
                                fprintf(fd, "[error] %s: cannot create sequence declaration.\n", __func__);
                                g_free(length_name);
@@ -1007,7 +1007,7 @@ int ctf_enumerator_list_visit(FILE *fd, int depth,
                if (nr_vals <= 1)
                        end = start;
                last->u.s = end + 1;
-               enum_signed_insert(enum_declaration, start, end, q);
+               bt_enum_signed_insert(enum_declaration, start, end, q);
        } else {
                uint64_t start, end;
                int nr_vals = 0;
@@ -1047,7 +1047,7 @@ int ctf_enumerator_list_visit(FILE *fd, int depth,
                if (nr_vals <= 1)
                        end = start;
                last->u.u = end + 1;
-               enum_unsigned_insert(enum_declaration, start, end, q);
+               bt_enum_unsigned_insert(enum_declaration, start, end, q);
        }
        return 0;
 }
@@ -1114,7 +1114,7 @@ struct declaration *ctf_declaration_enum_visit(FILE *fd, int depth,
                        return NULL;
                }
                integer_declaration = container_of(declaration, struct declaration_integer, p);
-               enum_declaration = enum_declaration_new(integer_declaration);
+               enum_declaration = bt_enum_declaration_new(integer_declaration);
                bt_declaration_unref(&integer_declaration->p);  /* leave ref to enum */
                if (enum_declaration->integer_declaration->signedness) {
                        last_value.u.s = 0;
@@ -3004,19 +3004,19 @@ int ctf_destroy_metadata(struct ctf_trace *trace)
                                        if (!event)
                                                continue;
                                        if (&event->event_fields->p)
-                                               definition_unref(&event->event_fields->p);
+                                               bt_definition_unref(&event->event_fields->p);
                                        if (&event->event_context->p)
-                                               definition_unref(&event->event_context->p);
+                                               bt_definition_unref(&event->event_context->p);
                                        g_free(event);
                                }
                                if (&stream_def->trace_packet_header->p)
-                                       definition_unref(&stream_def->trace_packet_header->p);
+                                       bt_definition_unref(&stream_def->trace_packet_header->p);
                                if (&stream_def->stream_event_header->p)
-                                       definition_unref(&stream_def->stream_event_header->p);
+                                       bt_definition_unref(&stream_def->stream_event_header->p);
                                if (&stream_def->stream_packet_context->p)
-                                       definition_unref(&stream_def->stream_packet_context->p);
+                                       bt_definition_unref(&stream_def->stream_packet_context->p);
                                if (&stream_def->stream_event_context->p)
-                                       definition_unref(&stream_def->stream_event_context->p);
+                                       bt_definition_unref(&stream_def->stream_event_context->p);
                                g_ptr_array_free(stream_def->events_by_id, TRUE);
                                g_free(stream_def);
                        }