namespace the variant functions

[babeltrace.git] / formats / ctf / ctf.c

diff --git a/formats/ctf/ctf.c b/formats/ctf/ctf.c
index 6a24087447b6fb5738f643ef6f24f51df0211904..ba403aa629e2b0bfdcd5a5370b2ead441db9fea1 100644 (file)
--- a/formats/ctf/ctf.c
+++ b/formats/ctf/ctf.c
@@ -439,7 +439,7 @@ int ctf_read_event(struct stream_pos *ppos, struct ctf_stream_definition *stream
                        }
                }
 
-               variant = lookup_variant(&stream->stream_event_header->p, "v");
+               variant = bt_lookup_variant(&stream->stream_event_header->p, "v");
                if (variant) {
                        integer_definition = lookup_integer(variant, "id", FALSE);
                        if (integer_definition) {
@@ -1311,13 +1311,13 @@ int create_stream_packet_index(struct ctf_trace *td,
                        ret = generic_rw(&pos->parent, &file_stream->parent.trace_packet_header->p);
                        if (ret)
                                return ret;
-                       len_index = struct_declaration_lookup_field_index(file_stream->parent.trace_packet_header->declaration, g_quark_from_static_string("magic"));
+                       len_index = bt_struct_declaration_lookup_field_index(file_stream->parent.trace_packet_header->declaration, g_quark_from_static_string("magic"));
                        if (len_index >= 0) {
                                struct definition *field;
                                uint64_t magic;
 
-                               field = struct_definition_get_field_from_index(file_stream->parent.trace_packet_header, len_index);
-                               magic = get_unsigned_int(field);
+                               field = bt_struct_definition_get_field_from_index(file_stream->parent.trace_packet_header, len_index);
+                               magic = bt_get_unsigned_int(field);
                                if (magic != CTF_MAGIC) {
                                        fprintf(stderr, "[error] Invalid magic number 0x%" PRIX64 " at packet %u (file offset %zd).\n",
                                                        magic,
@@ -1328,14 +1328,14 @@ int create_stream_packet_index(struct ctf_trace *td,
                        }
 
                        /* check uuid */
-                       len_index = struct_declaration_lookup_field_index(file_stream->parent.trace_packet_header->declaration, g_quark_from_static_string("uuid"));
+                       len_index = bt_struct_declaration_lookup_field_index(file_stream->parent.trace_packet_header->declaration, g_quark_from_static_string("uuid"));
                        if (len_index >= 0) {
                                struct definition_array *defarray;
                                struct definition *field;
                                uint64_t i;
                                uint8_t uuidval[BABELTRACE_UUID_LEN];
 
-                               field = struct_definition_get_field_from_index(file_stream->parent.trace_packet_header, len_index);
+                               field = bt_struct_definition_get_field_from_index(file_stream->parent.trace_packet_header, len_index);
                                assert(field->declaration->id == CTF_TYPE_ARRAY);
                                defarray = container_of(field, struct definition_array, p);
                                assert(bt_array_len(defarray) == BABELTRACE_UUID_LEN);
@@ -1344,7 +1344,7 @@ int create_stream_packet_index(struct ctf_trace *td,
                                        struct definition *elem;
 
                                        elem = bt_array_index(defarray, i);
-                                       uuidval[i] = get_unsigned_int(elem);
+                                       uuidval[i] = bt_get_unsigned_int(elem);
                                }
                                ret = babeltrace_uuid_compare(td->uuid, uuidval);
                                if (ret) {
@@ -1354,12 +1354,12 @@ int create_stream_packet_index(struct ctf_trace *td,
                        }
 
 
-                       len_index = struct_declaration_lookup_field_index(file_stream->parent.trace_packet_header->declaration, g_quark_from_static_string("stream_id"));
+                       len_index = bt_struct_declaration_lookup_field_index(file_stream->parent.trace_packet_header->declaration, g_quark_from_static_string("stream_id"));
                        if (len_index >= 0) {
                                struct definition *field;
 
-                               field = struct_definition_get_field_from_index(file_stream->parent.trace_packet_header, len_index);
-                               stream_id = get_unsigned_int(field);
+                               field = bt_struct_definition_get_field_from_index(file_stream->parent.trace_packet_header, len_index);
+                               stream_id = bt_get_unsigned_int(field);
                        }
                }
 
@@ -1391,36 +1391,36 @@ int create_stream_packet_index(struct ctf_trace *td,
                        if (ret)
                                return ret;
                        /* read content size from header */
-                       len_index = struct_declaration_lookup_field_index(file_stream->parent.stream_packet_context->declaration, g_quark_from_static_string("content_size"));
+                       len_index = bt_struct_declaration_lookup_field_index(file_stream->parent.stream_packet_context->declaration, g_quark_from_static_string("content_size"));
                        if (len_index >= 0) {
                                struct definition *field;
 
-                               field = struct_definition_get_field_from_index(file_stream->parent.stream_packet_context, len_index);
-                               packet_index.content_size = get_unsigned_int(field);
+                               field = bt_struct_definition_get_field_from_index(file_stream->parent.stream_packet_context, len_index);
+                               packet_index.content_size = bt_get_unsigned_int(field);
                        } else {
                                /* Use file size for packet size */
                                packet_index.content_size = filestats.st_size * CHAR_BIT;
                        }
 
                        /* read packet size from header */
-                       len_index = struct_declaration_lookup_field_index(file_stream->parent.stream_packet_context->declaration, g_quark_from_static_string("packet_size"));
+                       len_index = bt_struct_declaration_lookup_field_index(file_stream->parent.stream_packet_context->declaration, g_quark_from_static_string("packet_size"));
                        if (len_index >= 0) {
                                struct definition *field;
 
-                               field = struct_definition_get_field_from_index(file_stream->parent.stream_packet_context, len_index);
-                               packet_index.packet_size = get_unsigned_int(field);
+                               field = bt_struct_definition_get_field_from_index(file_stream->parent.stream_packet_context, len_index);
+                               packet_index.packet_size = bt_get_unsigned_int(field);
                        } else {
                                /* Use content size if non-zero, else file size */
                                packet_index.packet_size = packet_index.content_size ? : filestats.st_size * CHAR_BIT;
                        }
 
                        /* read timestamp begin from header */
-                       len_index = struct_declaration_lookup_field_index(file_stream->parent.stream_packet_context->declaration, g_quark_from_static_string("timestamp_begin"));
+                       len_index = bt_struct_declaration_lookup_field_index(file_stream->parent.stream_packet_context->declaration, g_quark_from_static_string("timestamp_begin"));
                        if (len_index >= 0) {
                                struct definition *field;
 
-                               field = struct_definition_get_field_from_index(file_stream->parent.stream_packet_context, len_index);
-                               packet_index.timestamp_begin = get_unsigned_int(field);
+                               field = bt_struct_definition_get_field_from_index(file_stream->parent.stream_packet_context, len_index);
+                               packet_index.timestamp_begin = bt_get_unsigned_int(field);
                                if (file_stream->parent.stream_class->trace->collection) {
                                        packet_index.timestamp_begin =
                                                ctf_get_real_timestamp(
@@ -1430,12 +1430,12 @@ int create_stream_packet_index(struct ctf_trace *td,
                        }
 
                        /* read timestamp end from header */
-                       len_index = struct_declaration_lookup_field_index(file_stream->parent.stream_packet_context->declaration, g_quark_from_static_string("timestamp_end"));
+                       len_index = bt_struct_declaration_lookup_field_index(file_stream->parent.stream_packet_context->declaration, g_quark_from_static_string("timestamp_end"));
                        if (len_index >= 0) {
                                struct definition *field;
 
-                               field = struct_definition_get_field_from_index(file_stream->parent.stream_packet_context, len_index);
-                               packet_index.timestamp_end = get_unsigned_int(field);
+                               field = bt_struct_definition_get_field_from_index(file_stream->parent.stream_packet_context, len_index);
+                               packet_index.timestamp_end = bt_get_unsigned_int(field);
                                if (file_stream->parent.stream_class->trace->collection) {
                                        packet_index.timestamp_end =
                                                ctf_get_real_timestamp(
@@ -1445,13 +1445,13 @@ int create_stream_packet_index(struct ctf_trace *td,
                        }
 
                        /* read events discarded from header */
-                       len_index = struct_declaration_lookup_field_index(file_stream->parent.stream_packet_context->declaration, g_quark_from_static_string("events_discarded"));
+                       len_index = bt_struct_declaration_lookup_field_index(file_stream->parent.stream_packet_context->declaration, g_quark_from_static_string("events_discarded"));
                        if (len_index >= 0) {
                                struct definition *field;
 
-                               field = struct_definition_get_field_from_index(file_stream->parent.stream_packet_context, len_index);
-                               packet_index.events_discarded = get_unsigned_int(field);
-                               packet_index.events_discarded_len = get_int_len(field);
+                               field = bt_struct_definition_get_field_from_index(file_stream->parent.stream_packet_context, len_index);
+                               packet_index.events_discarded = bt_get_unsigned_int(field);
+                               packet_index.events_discarded_len = bt_get_int_len(field);
                        }
                } else {
                        /* Use file size for packet size */