lib: make graph API const-correct

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

diff --git a/plugins/ctf/fs-src/fs.c b/plugins/ctf/fs-src/fs.c
index 2dfaa19f1ee4bd2d3ef288f914aa3161aec23233..3ace7653a7219370d0240988e56c3d68cd4ac303 100644 (file)
--- a/plugins/ctf/fs-src/fs.c
+++ b/plugins/ctf/fs-src/fs.c
@@ -90,15 +90,15 @@ void ctf_fs_notif_iter_data_destroy(
 static
 enum bt_self_notification_iterator_status ctf_fs_iterator_next_one(
                struct ctf_fs_notif_iter_data *notif_iter_data,
-               struct bt_notification **notif)
+               const struct bt_notification **notif)
 {
        enum bt_self_notification_iterator_status status;
-       struct bt_private_notification *priv_notif;
+       struct bt_notification *priv_notif;
        int ret;
 
        BT_ASSERT(notif_iter_data->ds_file);
        status = ctf_fs_ds_file_next(notif_iter_data->ds_file, &priv_notif);
-       *notif = bt_private_notification_as_notification(priv_notif);
+       *notif = priv_notif;
 
        if (status == BT_SELF_NOTIFICATION_ITERATOR_STATUS_OK &&
                        bt_notification_get_type(*notif) ==
@@ -112,7 +112,7 @@ enum bt_self_notification_iterator_status ctf_fs_iterator_next_one(
                        BT_OBJECT_PUT_REF_AND_RESET(*notif);
                        status = ctf_fs_ds_file_next(notif_iter_data->ds_file,
                                &priv_notif);
-                       *notif = bt_private_notification_as_notification(priv_notif);
+                       *notif = priv_notif;
                        BT_ASSERT(status != BT_SELF_NOTIFICATION_ITERATOR_STATUS_END);
                        goto end;
                } else {
@@ -158,7 +158,7 @@ enum bt_self_notification_iterator_status ctf_fs_iterator_next_one(
                }
 
                status = ctf_fs_ds_file_next(notif_iter_data->ds_file, &priv_notif);
-               *notif = bt_private_notification_as_notification(priv_notif);
+               *notif = priv_notif;
 
                /*
                 * If we get a notification, we expect to get a
@@ -184,7 +184,7 @@ enum bt_self_notification_iterator_status ctf_fs_iterator_next_one(
                        BT_OBJECT_PUT_REF_AND_RESET(*notif);
                        status = ctf_fs_ds_file_next(notif_iter_data->ds_file,
                                &priv_notif);
-                       *notif = bt_private_notification_as_notification(priv_notif);
+                       *notif = priv_notif;
                        BT_ASSERT(status != BT_SELF_NOTIFICATION_ITERATOR_STATUS_END);
                }
        }
@@ -196,7 +196,7 @@ end:
 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)
 {
        enum bt_self_notification_iterator_status status =
@@ -518,7 +518,7 @@ void ctf_fs_ds_file_group_destroy(struct ctf_fs_ds_file_group *ds_file_group)
 static
 struct ctf_fs_ds_file_group *ctf_fs_ds_file_group_create(
                struct ctf_fs_trace *ctf_fs_trace,
-               struct bt_private_stream_class *stream_class,
+               struct bt_stream_class *stream_class,
                uint64_t stream_instance_id)
 {
        struct ctf_fs_ds_file_group *ds_file_group;
@@ -612,7 +612,7 @@ static
 int add_ds_file_to_ds_file_group(struct ctf_fs_trace *ctf_fs_trace,
                const char *path)
 {
-       struct bt_private_stream_class *stream_class = NULL;
+       struct bt_stream_class *stream_class = NULL;
        int64_t stream_instance_id = -1;
        int64_t begin_ns = -1;
        struct ctf_fs_ds_file_group *ds_file_group = NULL;
@@ -658,8 +658,7 @@ int add_ds_file_to_ds_file_group(struct ctf_fs_trace *ctf_fs_trace,
        if (props.snapshots.beginning_clock != UINT64_C(-1)) {
                BT_ASSERT(sc->default_clock_class);
                ret = bt_clock_class_cycles_to_ns_from_origin(
-                       bt_private_clock_class_as_clock_class(
-                               sc->default_clock_class),
+                       sc->default_clock_class,
                        props.snapshots.beginning_clock, &begin_ns);
                if (ret) {
                        BT_LOGE("Cannot convert clock cycles to nanoseconds from origin (`%s`).",
@@ -860,13 +859,13 @@ int create_ds_file_groups(struct ctf_fs_trace *ctf_fs_trace)
 
                if (ds_file_group->stream_id == UINT64_C(-1)) {
                        /* No stream ID: use 0 */
-                       ds_file_group->stream = bt_private_stream_create_with_id(
+                       ds_file_group->stream = bt_stream_create_with_id(
                                ds_file_group->stream_class,
                                ctf_fs_trace->next_stream_id);
                        ctf_fs_trace->next_stream_id++;
                } else {
                        /* Specific stream ID */
-                       ds_file_group->stream = bt_private_stream_create_with_id(
+                       ds_file_group->stream = bt_stream_create_with_id(
                                ds_file_group->stream_class,
                                (uint64_t) ds_file_group->stream_id);
                }
@@ -879,7 +878,7 @@ int create_ds_file_groups(struct ctf_fs_trace *ctf_fs_trace)
                        goto error;
                }
 
-               ret = bt_private_stream_set_name(ds_file_group->stream,
+               ret = bt_stream_set_name(ds_file_group->stream,
                        name->str);
                if (ret) {
                        BT_LOGE("Cannot set stream's name: "
@@ -959,7 +958,7 @@ struct ctf_fs_trace *ctf_fs_trace_create(const char *path, const char *name,
         * trace needs. There won't be any more. Therefore it is safe to
         * make this trace static.
         */
-       (void) bt_private_trace_make_static(ctf_fs_trace->metadata->trace);
+       (void) bt_trace_make_static(ctf_fs_trace->metadata->trace);
 
        goto end;
 
@@ -1340,7 +1339,7 @@ enum bt_self_component_status ctf_fs_init(
 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)
 {