Rename bt_ctf_X -> bt_X, maintain backward compat. for pre-2.0 CTF writer

[babeltrace.git] / lib / graph / notification / stream.c

diff --git a/lib/graph/notification/stream.c b/lib/graph/notification/stream.c
index 9908c9703a7a3c41ca16e0356e809372fb1cc086..c036d1bff545c2ffcf9565127366370bbfd7c6bb 100644 (file)
--- a/lib/graph/notification/stream.c
+++ b/lib/graph/notification/stream.c
@@ -47,17 +47,17 @@ void bt_notification_stream_end_destroy(struct bt_object *obj)
 }
 
 struct bt_notification *bt_notification_stream_end_create(
-               struct bt_ctf_stream *stream)
+               struct bt_stream *stream)
 {
        struct bt_notification_stream_end *notification;
-       struct bt_ctf_stream_class *stream_class;
+       struct bt_stream_class *stream_class;
 
        if (!stream) {
                BT_LOGW_STR("Invalid parameter: stream is NULL.");
                goto error;
        }
 
-       stream_class = bt_ctf_stream_borrow_stream_class(stream);
+       stream_class = bt_stream_borrow_stream_class(stream);
        assert(stream_class);
 
        if (stream->pos.fd >= 0) {
@@ -65,9 +65,9 @@ struct bt_notification *bt_notification_stream_end_create(
                        "stream-addr=%p, stream-name=\"%s\", "
                        "stream-class-addr=%p, stream-class-name\"%s\", "
                        "stream-class-id=%" PRId64,
-                       stream, bt_ctf_stream_get_name(stream), stream_class,
-                       bt_ctf_stream_class_get_name(stream_class),
-                       bt_ctf_stream_class_get_id(stream_class));
+                       stream, bt_stream_get_name(stream), stream_class,
+                       bt_stream_class_get_name(stream_class),
+                       bt_stream_class_get_id(stream_class));
                goto error;
        }
 
@@ -75,10 +75,10 @@ struct bt_notification *bt_notification_stream_end_create(
                "stream-addr=%p, stream-name=\"%s\", "
                "stream-class-addr=%p, stream-class-name=\"%s\", "
                "stream-class-id=%" PRId64,
-               stream, bt_ctf_stream_get_name(stream),
+               stream, bt_stream_get_name(stream),
                stream_class,
-               bt_ctf_stream_class_get_name(stream_class),
-               bt_ctf_stream_class_get_id(stream_class));
+               bt_stream_class_get_name(stream_class),
+               bt_stream_class_get_id(stream_class));
        notification = g_new0(struct bt_notification_stream_end, 1);
        if (!notification) {
                BT_LOGE_STR("Failed to allocate one stream end notification.");
@@ -93,20 +93,20 @@ struct bt_notification *bt_notification_stream_end_create(
                "stream-addr=%p, stream-name=\"%s\", "
                "stream-class-addr=%p, stream-class-name=\"%s\", "
                "stream-class-id=%" PRId64 ", addr=%p",
-               stream, bt_ctf_stream_get_name(stream),
+               stream, bt_stream_get_name(stream),
                stream_class,
-               bt_ctf_stream_class_get_name(stream_class),
-               bt_ctf_stream_class_get_id(stream_class), notification);
+               bt_stream_class_get_name(stream_class),
+               bt_stream_class_get_id(stream_class), notification);
        return &notification->parent;
 error:
        return NULL;
 }
 
-struct bt_ctf_stream *bt_notification_stream_end_get_stream(
+struct bt_stream *bt_notification_stream_end_get_stream(
                struct bt_notification *notification)
 {
        struct bt_notification_stream_end *stream_end;
-       struct bt_ctf_stream *stream = NULL;
+       struct bt_stream *stream = NULL;
 
        if (!notification) {
                BT_LOGW_STR("Invalid parameter: notification is NULL.");
@@ -143,17 +143,17 @@ void bt_notification_stream_begin_destroy(struct bt_object *obj)
 }
 
 struct bt_notification *bt_notification_stream_begin_create(
-               struct bt_ctf_stream *stream)
+               struct bt_stream *stream)
 {
        struct bt_notification_stream_begin *notification;
-       struct bt_ctf_stream_class *stream_class;
+       struct bt_stream_class *stream_class;
 
        if (!stream) {
                BT_LOGW_STR("Invalid parameter: stream is NULL.");
                goto error;
        }
 
-       stream_class = bt_ctf_stream_borrow_stream_class(stream);
+       stream_class = bt_stream_borrow_stream_class(stream);
        assert(stream_class);
 
        if (stream->pos.fd >= 0) {
@@ -161,9 +161,9 @@ struct bt_notification *bt_notification_stream_begin_create(
                        "stream-addr=%p, stream-name=\"%s\", "
                        "stream-class-addr=%p, stream-class-name\"%s\", "
                        "stream-class-id=%" PRId64,
-                       stream, bt_ctf_stream_get_name(stream), stream_class,
-                       bt_ctf_stream_class_get_name(stream_class),
-                       bt_ctf_stream_class_get_id(stream_class));
+                       stream, bt_stream_get_name(stream), stream_class,
+                       bt_stream_class_get_name(stream_class),
+                       bt_stream_class_get_id(stream_class));
                goto error;
        }
 
@@ -171,10 +171,10 @@ struct bt_notification *bt_notification_stream_begin_create(
                "stream-addr=%p, stream-name=\"%s\", "
                "stream-class-addr=%p, stream-class-name=\"%s\", "
                "stream-class-id=%" PRId64,
-               stream, bt_ctf_stream_get_name(stream),
+               stream, bt_stream_get_name(stream),
                stream_class,
-               bt_ctf_stream_class_get_name(stream_class),
-               bt_ctf_stream_class_get_id(stream_class));
+               bt_stream_class_get_name(stream_class),
+               bt_stream_class_get_id(stream_class));
        notification = g_new0(struct bt_notification_stream_begin, 1);
        if (!notification) {
                BT_LOGE_STR("Failed to allocate one stream beginning notification.");
@@ -189,20 +189,20 @@ struct bt_notification *bt_notification_stream_begin_create(
                "stream-addr=%p, stream-name=\"%s\", "
                "stream-class-addr=%p, stream-class-name=\"%s\", "
                "stream-class-id=%" PRId64 ", addr=%p",
-               stream, bt_ctf_stream_get_name(stream),
+               stream, bt_stream_get_name(stream),
                stream_class,
-               bt_ctf_stream_class_get_name(stream_class),
-               bt_ctf_stream_class_get_id(stream_class), notification);
+               bt_stream_class_get_name(stream_class),
+               bt_stream_class_get_id(stream_class), notification);
        return &notification->parent;
 error:
        return NULL;
 }
 
-struct bt_ctf_stream *bt_notification_stream_begin_get_stream(
+struct bt_stream *bt_notification_stream_begin_get_stream(
                struct bt_notification *notification)
 {
        struct bt_notification_stream_begin *stream_begin;
-       struct bt_ctf_stream *stream = NULL;
+       struct bt_stream *stream = NULL;
 
        if (!notification) {
                BT_LOGW_STR("Invalid parameter: notification is NULL.");