Rename bt_ctf_type_id -> bt_ctf_field_type_id (and the enumerators)

[babeltrace.git] / lib / ctf-ir / stream.c

diff --git a/lib/ctf-ir/stream.c b/lib/ctf-ir/stream.c
index 39d490c38bb695a11a5e8fb4fb01c7c0f064f409..a06cbbbf64a7844e0878ff533137290ea409c040 100644 (file)
--- a/lib/ctf-ir/stream.c
+++ b/lib/ctf-ir/stream.c
@@ -66,7 +66,7 @@ int set_integer_field_value(struct bt_ctf_field* field, uint64_t value)
        assert(field_type);
 
        if (bt_ctf_field_type_get_type_id(field_type) !=
-                       BT_CTF_TYPE_ID_INTEGER) {
+                       BT_CTF_FIELD_TYPE_ID_INTEGER) {
                /* Not an integer and the value is unset, error. */
                ret = -1;
                goto end;
@@ -112,7 +112,7 @@ int set_packet_header_magic(struct bt_ctf_stream *stream)
        assert(magic_field_type);
 
        if (bt_ctf_field_type_get_type_id(magic_field_type) !=
-               BT_CTF_TYPE_ID_INTEGER) {
+               BT_CTF_FIELD_TYPE_ID_INTEGER) {
                /* Magic field is not an integer. Not an error, skip. */
                goto end;
        }
@@ -163,7 +163,7 @@ int set_packet_header_uuid(struct bt_ctf_stream *stream)
        uuid_field_type = bt_ctf_field_get_type(uuid_field);
        assert(uuid_field_type);
        if (bt_ctf_field_type_get_type_id(uuid_field_type) !=
-               BT_CTF_TYPE_ID_ARRAY) {
+               BT_CTF_FIELD_TYPE_ID_ARRAY) {
                /* UUID field is not an array. Not an error, skip. */
                goto end;
        }
@@ -180,7 +180,7 @@ int set_packet_header_uuid(struct bt_ctf_stream *stream)
                uuid_field_type);
        assert(element_field_type);
        if (bt_ctf_field_type_get_type_id(element_field_type) !=
-               BT_CTF_TYPE_ID_INTEGER) {
+               BT_CTF_FIELD_TYPE_ID_INTEGER) {
                /* UUID array elements are not integers. Not an error, skip */
                goto end;
        }
@@ -236,7 +236,7 @@ int set_packet_header_stream_id(struct bt_ctf_stream *stream)
        stream_id_field_type = bt_ctf_field_get_type(stream_id_field);
        assert(stream_id_field_type);
        if (bt_ctf_field_type_get_type_id(stream_id_field_type) !=
-               BT_CTF_TYPE_ID_INTEGER) {
+               BT_CTF_FIELD_TYPE_ID_INTEGER) {
                /* stream_id field is not an integer. Not an error, skip. */
                goto end;
        }
@@ -841,7 +841,7 @@ int get_event_header_timestamp(struct bt_ctf_field *event_header, uint64_t *time
        timestamp_field_type = bt_ctf_field_get_type(timestamp_field);
        assert(timestamp_field_type);
        if (bt_ctf_field_type_get_type_id(timestamp_field_type) !=
-               BT_CTF_TYPE_ID_INTEGER) {
+               BT_CTF_FIELD_TYPE_ID_INTEGER) {
                ret = -1;
                goto end;
        }
@@ -1158,7 +1158,7 @@ int _set_structure_field_integer(struct bt_ctf_field *structure, char *name,
 
        field_type = bt_ctf_field_get_type(integer);
        assert(field_type);
-       if (bt_ctf_field_type_get_type_id(field_type) != BT_CTF_TYPE_ID_INTEGER) {
+       if (bt_ctf_field_type_get_type_id(field_type) != BT_CTF_FIELD_TYPE_ID_INTEGER) {
                /*
                 * The user most likely meant for us to populate this field
                 * automatically. However, we can only do this if the field