X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fplugins%2Fctf%2Ffs-sink%2Ffs-sink.cpp;h=6b0c88da9b0c59e0b127b36e84f27c4e5f6ce3e4;hb=HEAD;hp=52d3d426ad33da8e6d9ad21561aee893a7895383;hpb=1e690349e56f6aed18afca0730159a6c374171c6;p=babeltrace.git

diff --git a/src/plugins/ctf/fs-sink/fs-sink.cpp b/src/plugins/ctf/fs-sink/fs-sink.cpp
index 52d3d426..c580b39f 100644
--- a/src/plugins/ctf/fs-sink/fs-sink.cpp
+++ b/src/plugins/ctf/fs-sink/fs-sink.cpp
@@ -10,6 +10,7 @@
 #include <babeltrace2/babeltrace.h>
 
 #include "common/assert.h"
+#include "cpp-common/bt2/wrap.hpp"
 #include "cpp-common/vendor/fmt/format.h"
 #include "ctfser/ctfser.h"
 
@@ -136,9 +137,8 @@ bt_component_class_initialize_method_status ctf_fs_sink_init(bt_self_component_s
         bt_component_class_initialize_method_status status;
         bt_self_component_add_port_status add_port_status;
         struct fs_sink_comp *fs_sink = NULL;
-        bt_self_component *self_comp = bt_self_component_sink_as_self_component(self_comp_sink);
 
-        fs_sink = new fs_sink_comp {bt2::SelfSinkComponent {self_comp_sink}};
+        fs_sink = new fs_sink_comp {bt2::wrap(self_comp_sink)};
         fs_sink->output_dir_path = g_string_new(NULL);
         status = configure_component(fs_sink, params);
         if (status != BT_COMPONENT_CLASS_INITIALIZE_METHOD_STATUS_OK) {
@@ -177,7 +177,8 @@ bt_component_class_initialize_method_status ctf_fs_sink_init(bt_self_component_s
             goto end;
         }
 
-        bt_self_component_set_data(self_comp, fs_sink);
+        bt_self_component_set_data(bt_self_component_sink_as_self_component(self_comp_sink),
+                                   fs_sink);
 
 end:
         if (status != BT_COMPONENT_CLASS_INITIALIZE_METHOD_STATUS_OK) {
@@ -965,8 +966,7 @@ bt_component_class_sink_consume_method_status ctf_fs_sink_consume(bt_self_compon
                 break;
             case BT_MESSAGE_TYPE_MESSAGE_ITERATOR_INACTIVITY:
                 /* Ignore */
-                BT_CPPLOGD_STR_SPEC(fs_sink->logger,
-                                    "Ignoring message iterator inactivity message.");
+                BT_CPPLOGD_SPEC(fs_sink->logger, "Ignoring message iterator inactivity message.");
                 break;
             case BT_MESSAGE_TYPE_STREAM_BEGINNING:
                 status = handle_stream_beginning_msg(fs_sink, msg);