namespace the int functions

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

diff --git a/formats/ctf/ctf.c b/formats/ctf/ctf.c
index a55f5e4e07a7068e1056fbcafbafbdabbe0e842f..45ab65ef92db54f365ec57b7655e0606e2291093 100644 (file)
--- a/formats/ctf/ctf.c
+++ b/formats/ctf/ctf.c
@@ -1168,9 +1168,9 @@ struct ctf_event_definition *create_event_definitions(struct ctf_trace *td,
 
 error:
        if (stream_event->event_fields)
-               definition_unref(&stream_event->event_fields->p);
+               bt_definition_unref(&stream_event->event_fields->p);
        if (stream_event->event_context)
-               definition_unref(&stream_event->event_context->p);
+               bt_definition_unref(&stream_event->event_context->p);
        return NULL;
 }
 
@@ -1246,11 +1246,11 @@ error_event:
        g_ptr_array_free(stream->events_by_id, TRUE);
 error:
        if (stream->stream_event_context)
-               definition_unref(&stream->stream_event_context->p);
+               bt_definition_unref(&stream->stream_event_context->p);
        if (stream->stream_event_header)
-               definition_unref(&stream->stream_event_header->p);
+               bt_definition_unref(&stream->stream_event_header->p);
        if (stream->stream_packet_context)
-               definition_unref(&stream->stream_packet_context->p);
+               bt_definition_unref(&stream->stream_packet_context->p);
        return ret;
 }
 
@@ -1317,7 +1317,7 @@ int create_stream_packet_index(struct ctf_trace *td,
                                uint64_t magic;
 
                                field = struct_definition_get_field_from_index(file_stream->parent.trace_packet_header, len_index);
-                               magic = get_unsigned_int(field);
+                               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,
@@ -1338,13 +1338,13 @@ int create_stream_packet_index(struct ctf_trace *td,
                                field = 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(array_len(defarray) == BABELTRACE_UUID_LEN);
+                               assert(bt_array_len(defarray) == BABELTRACE_UUID_LEN);
 
                                for (i = 0; i < BABELTRACE_UUID_LEN; i++) {
                                        struct definition *elem;
 
-                                       elem = array_index(defarray, i);
-                                       uuidval[i] = get_unsigned_int(elem);
+                                       elem = bt_array_index(defarray, i);
+                                       uuidval[i] = bt_get_unsigned_int(elem);
                                }
                                ret = babeltrace_uuid_compare(td->uuid, uuidval);
                                if (ret) {
@@ -1359,7 +1359,7 @@ int create_stream_packet_index(struct ctf_trace *td,
                                struct definition *field;
 
                                field = struct_definition_get_field_from_index(file_stream->parent.trace_packet_header, len_index);
-                               stream_id = get_unsigned_int(field);
+                               stream_id = bt_get_unsigned_int(field);
                        }
                }
 
@@ -1396,7 +1396,7 @@ int create_stream_packet_index(struct ctf_trace *td,
                                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);
+                               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;
@@ -1408,7 +1408,7 @@ int create_stream_packet_index(struct ctf_trace *td,
                                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);
+                               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;
@@ -1420,7 +1420,7 @@ int create_stream_packet_index(struct ctf_trace *td,
                                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);
+                               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(
@@ -1435,7 +1435,7 @@ int create_stream_packet_index(struct ctf_trace *td,
                                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);
+                               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(
@@ -1450,8 +1450,8 @@ int create_stream_packet_index(struct ctf_trace *td,
                                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);
+                               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 */
@@ -1572,7 +1572,7 @@ int ctf_open_file_stream_read(struct ctf_trace *td, const char *path, int flags,
 
 error_index:
        if (file_stream->parent.trace_packet_header)
-               definition_unref(&file_stream->parent.trace_packet_header->p);
+               bt_definition_unref(&file_stream->parent.trace_packet_header->p);
 error_def:
        closeret = ctf_fini_pos(&file_stream->pos);
        if (closeret) {
@@ -1811,7 +1811,7 @@ int ctf_open_mmap_stream_read(struct ctf_trace *td,
 
 error_index:
        if (file_stream->parent.trace_packet_header)
-               definition_unref(&file_stream->parent.trace_packet_header->p);
+               bt_definition_unref(&file_stream->parent.trace_packet_header->p);
 error_def:
        g_free(file_stream);
        return ret;