namespace definition_ref and definition_unref

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

diff --git a/formats/ctf/ctf.c b/formats/ctf/ctf.c
index 18a560132582ac9002535658734b51cb3abe68e8..6a24087447b6fb5738f643ef6f24f51df0211904 100644 (file)
--- a/formats/ctf/ctf.c
+++ b/formats/ctf/ctf.c
@@ -307,6 +307,7 @@ void ctf_update_timestamp(struct ctf_stream_definition *stream,
  * Print timestamp, rescaling clock frequency to nanoseconds and
  * applying offsets as needed (unix time).
  */
+static
 void ctf_print_timestamp_real(FILE *fp,
                        struct ctf_stream_definition *stream,
                        uint64_t timestamp)
@@ -371,6 +372,7 @@ end:
 /*
  * Print timestamp, in cycles
  */
+static
 void ctf_print_timestamp_cycles(FILE *fp,
                struct ctf_stream_definition *stream,
                uint64_t timestamp)
@@ -431,7 +433,7 @@ int ctf_read_event(struct stream_pos *ppos, struct ctf_stream_definition *stream
                } else {
                        struct definition_enum *enum_definition;
 
-                       enum_definition = lookup_enum(&stream->stream_event_header->p, "id", FALSE);
+                       enum_definition = bt_lookup_enum(&stream->stream_event_header->p, "id", FALSE);
                        if (enum_definition) {
                                id = enum_definition->integer->value._unsigned;
                        }
@@ -1166,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;
 }
 
@@ -1244,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;
 }
 
@@ -1336,12 +1338,12 @@ 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);
+                                       elem = bt_array_index(defarray, i);
                                        uuidval[i] = get_unsigned_int(elem);
                                }
                                ret = babeltrace_uuid_compare(td->uuid, uuidval);
@@ -1570,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) {
@@ -1724,7 +1726,7 @@ error:
        return NULL;
 }
 
-
+static
 void ctf_init_mmap_pos(struct ctf_stream_pos *pos,
                struct mmap_stream *mmap_info)
 {
@@ -1809,12 +1811,13 @@ 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;
 }
 
+static
 int ctf_open_mmap_trace_read(struct ctf_trace *td,
                struct mmap_stream_list *mmap_list,
                void (*packet_seek)(struct stream_pos *pos, size_t index,