lib: rename "begin" to "beginning" when used as a noun

[babeltrace.git] / plugins / ctf / fs-src / fs.h

diff --git a/plugins/ctf/fs-src/fs.h b/plugins/ctf/fs-src/fs.h
index c5590d7eb396d481ed16bd5939e1cbee7a8b8106..5619e1b25517aa3b26f0b53de114b1b5ac85f804 100644 (file)
--- a/plugins/ctf/fs-src/fs.h
+++ b/plugins/ctf/fs-src/fs.h
@@ -53,7 +53,7 @@ struct ctf_fs_metadata {
        struct ctf_metadata_decoder *decoder;
 
        /* Owned by this */
-       struct bt_private_trace *trace;
+       struct bt_trace_class *trace_class;
 
        /* Weak (owned by `decoder` above) */
        struct ctf_trace_class *tc;
@@ -85,6 +85,9 @@ struct ctf_fs_trace {
        /* Owned by this */
        struct ctf_fs_metadata *metadata;
 
+       /* Owned by this */
+       struct bt_trace *trace;
+
        /* Array of struct ctf_fs_ds_file_group *, owned by this */
        GPtrArray *ds_file_groups;
 
@@ -111,10 +114,10 @@ struct ctf_fs_ds_file_group {
        GPtrArray *ds_file_infos;
 
        /* Owned by this */
-       struct bt_private_stream_class *stream_class;
+       struct bt_stream_class *stream_class;
 
        /* Owned by this */
-       struct bt_private_stream *stream;
+       struct bt_stream *stream;
 
        /* Stream (instance) ID; -1ULL means none */
        uint64_t stream_id;
@@ -147,7 +150,7 @@ struct ctf_fs_notif_iter_data {
        /* Owned by this */
        struct bt_notif_iter *notif_iter;
 
-       /* True to skip BT_NOTIFICATION_TYPE_STREAM_BEGIN notifications */
+       /* True to skip BT_NOTIFICATION_TYPE_STREAM_BEGINNING notifications */
        bool skip_stream_begin_notifs;
 };
 
@@ -162,7 +165,7 @@ void ctf_fs_finalize(struct bt_self_component_source *component);
 BT_HIDDEN
 enum bt_query_status ctf_fs_query(
                struct bt_self_component_class_source *comp_class,
-               struct bt_query_executor *query_exec,
+               const struct bt_query_executor *query_exec,
                const char *object, const struct bt_value *params,
                const struct bt_value **result);
 
@@ -191,7 +194,7 @@ void ctf_fs_iterator_finalize(struct bt_self_notification_iterator *it);
 BT_HIDDEN
 enum bt_self_notification_iterator_status ctf_fs_iterator_next(
                struct bt_self_notification_iterator *iterator,
-               bt_notification_array notifs, uint64_t capacity,
+               bt_notification_array_const notifs, uint64_t capacity,
                uint64_t *count);
 
 #endif /* BABELTRACE_PLUGIN_CTF_FS_H */