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

[babeltrace.git] / plugins / ctf / fs-sink / writer.c

diff --git a/plugins/ctf/fs-sink/writer.c b/plugins/ctf/fs-sink/writer.c
index 8f383a519de7cef9e5e4407ce3b8390d7c1d3840..fcc618661d29dc658ec5bce59395f071ab712512 100644 (file)
--- a/plugins/ctf/fs-sink/writer.c
+++ b/plugins/ctf/fs-sink/writer.c
@@ -26,20 +26,10 @@
  * SOFTWARE.
  */
 
-#include <babeltrace/ctf-ir/packet.h>
-#include <babeltrace/plugin/plugin-dev.h>
-#include <babeltrace/graph/connection.h>
-#include <babeltrace/graph/component.h>
-#include <babeltrace/graph/private-component.h>
-#include <babeltrace/graph/component-sink.h>
-#include <babeltrace/graph/private-component-sink.h>
-#include <babeltrace/graph/private-port.h>
-#include <babeltrace/graph/private-connection.h>
-#include <babeltrace/graph/notification.h>
-#include <babeltrace/graph/notification-iterator.h>
-#include <babeltrace/graph/notification-event.h>
-#include <babeltrace/graph/notification-packet.h>
-#include <babeltrace/graph/notification-stream.h>
+#define BT_LOG_TAG "PLUGIN-CTF-FS-SINK-WRITER"
+#include "logging.h"
+
+#include <babeltrace/babeltrace.h>
 #include <plugins-common.h>
 #include <stdio.h>
 #include <stdbool.h>
@@ -133,7 +123,7 @@ enum bt_component_status handle_notification(
        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);
 
                if (!packet) {
@@ -147,7 +137,7 @@ enum bt_component_status handle_notification(
        }
        case BT_NOTIFICATION_TYPE_PACKET_END:
        {
-               struct bt_ctf_packet *packet =
+               struct bt_packet *packet =
                        bt_notification_packet_end_get_packet(notification);
 
                if (!packet) {
@@ -160,7 +150,7 @@ enum bt_component_status handle_notification(
        }
        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);
 
                if (!event) {
@@ -176,7 +166,7 @@ enum bt_component_status handle_notification(
        }
        case BT_NOTIFICATION_TYPE_STREAM_BEGIN:
        {
-               struct bt_ctf_stream *stream =
+               struct bt_stream *stream =
                        bt_notification_stream_begin_get_stream(notification);
 
                if (!stream) {
@@ -189,7 +179,7 @@ enum bt_component_status handle_notification(
        }
        case BT_NOTIFICATION_TYPE_STREAM_END:
        {
-               struct bt_ctf_stream *stream =
+               struct bt_stream *stream =
                        bt_notification_stream_end_get_stream(notification);
 
                if (!stream) {
@@ -335,8 +325,7 @@ enum bt_component_status writer_component_init(
 
        value = bt_value_map_get(params, "path");
        if (!value || bt_value_is_null(value) || !bt_value_is_string(value)) {
-               fprintf(writer_component->err,
-                               "[error] output path parameter required\n");
+               BT_LOGE_STR("Missing mandatory \"path\" parameter.");
                ret = BT_COMPONENT_STATUS_INVALID;
                goto error;
        }
@@ -349,7 +338,7 @@ enum bt_component_status writer_component_init(
        bt_put(value);
 
        writer_component->base_path = g_string_new(path);
-       if (!writer_component) {
+       if (!writer_component->base_path) {
                ret = BT_COMPONENT_STATUS_ERROR;
                goto error;
        }