namespace the array functions

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

diff --git a/formats/ctf/ctf.c b/formats/ctf/ctf.c
index a55f5e4e07a7068e1056fbcafbafbdabbe0e842f..e18fffb1fa43030bb725f62cca380c8f51748f69 100644 (file)
--- a/formats/ctf/ctf.c
+++ b/formats/ctf/ctf.c
@@ -1338,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);
                                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;
 
 
                                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);
                                        uuidval[i] = get_unsigned_int(elem);
                                }
                                ret = babeltrace_uuid_compare(td->uuid, uuidval);