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

[babeltrace.git] / plugins / lttng-utils / plugin.c

diff --git a/plugins/lttng-utils/plugin.c b/plugins/lttng-utils/plugin.c
index f7f42f430bca7f7bbdbf3b8848b39aa4900f69ea..d12f5d5a1fa8c2199c16229129bb9b22444e7b47 100644 (file)
--- a/plugins/lttng-utils/plugin.c
+++ b/plugins/lttng-utils/plugin.c
@@ -29,19 +29,7 @@
 #define BT_LOG_TAG "PLUGIN-CTF-LTTNG-UTILS-DEBUG-INFO-FLT"
 #include "logging.h"
 
-#include <babeltrace/graph/notification-iterator.h>
-#include <babeltrace/graph/private-connection-private-notification-iterator.h>
-#include <babeltrace/graph/connection.h>
-#include <babeltrace/graph/notification.h>
-#include <babeltrace/graph/notification-event.h>
-#include <babeltrace/graph/notification-stream.h>
-#include <babeltrace/graph/notification-packet.h>
-#include <babeltrace/graph/component-filter.h>
-#include <babeltrace/graph/private-component-filter.h>
-#include <babeltrace/graph/private-port.h>
-#include <babeltrace/graph/private-connection.h>
-#include <babeltrace/graph/private-component.h>
-#include <babeltrace/plugin/plugin-dev.h>
+#include <babeltrace/babeltrace.h>
 #include <plugins-common.h>
 #include <assert.h>
 #include "debug-info.h"
@@ -126,9 +114,9 @@ struct bt_notification *handle_notification(FILE *err,
        switch (bt_notification_get_type(notification)) {
        case BT_NOTIFICATION_TYPE_PACKET_BEGIN:
        {
-               struct bt_ctf_packet *packet =
+               struct bt_packet *packet =
                        bt_notification_packet_begin_get_packet(notification);
-               struct bt_ctf_packet *writer_packet;
+               struct bt_packet *writer_packet;
 
                if (!packet) {
                        goto end;
@@ -145,9 +133,9 @@ struct bt_notification *handle_notification(FILE *err,
        }
        case BT_NOTIFICATION_TYPE_PACKET_END:
        {
-               struct bt_ctf_packet *packet =
+               struct bt_packet *packet =
                        bt_notification_packet_end_get_packet(notification);
-               struct bt_ctf_packet *writer_packet;
+               struct bt_packet *writer_packet;
 
                if (!packet) {
                        goto end;
@@ -164,9 +152,9 @@ struct bt_notification *handle_notification(FILE *err,
        }
        case BT_NOTIFICATION_TYPE_EVENT:
        {
-               struct bt_ctf_event *event = bt_notification_event_get_event(
+               struct bt_event *event = bt_notification_event_get_event(
                                notification);
-               struct bt_ctf_event *writer_event;
+               struct bt_event *writer_event;
                struct bt_clock_class_priority_map *cc_prio_map =
                        bt_notification_event_get_clock_class_priority_map(
                                        notification);
@@ -186,9 +174,9 @@ struct bt_notification *handle_notification(FILE *err,
        }
        case BT_NOTIFICATION_TYPE_STREAM_BEGIN:
        {
-               struct bt_ctf_stream *stream =
+               struct bt_stream *stream =
                        bt_notification_stream_begin_get_stream(notification);
-               struct bt_ctf_stream *writer_stream;
+               struct bt_stream *writer_stream;
 
                if (!stream) {
                        goto end;
@@ -205,9 +193,9 @@ struct bt_notification *handle_notification(FILE *err,
        }
        case BT_NOTIFICATION_TYPE_STREAM_END:
        {
-               struct bt_ctf_stream *stream =
+               struct bt_stream *stream =
                        bt_notification_stream_end_get_stream(notification);
-               struct bt_ctf_stream *writer_stream;
+               struct bt_stream *writer_stream;
 
                if (!stream) {
                        goto end;