Set private port's user data on creation

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

diff --git a/plugins/ctf/fs/fs.c b/plugins/ctf/fs/fs.c
index ece7ff97cbe1e0a9fdfa19ee18c286134d7beda4..669d2daa906d259dd586be96dcd6963cc46da524 100644 (file)
--- a/plugins/ctf/fs/fs.c
+++ b/plugins/ctf/fs/fs.c
@@ -43,6 +43,7 @@
 #include "metadata.h"
 #include "data-stream.h"
 #include "file.h"
+#include "../common/metadata/decoder.h"
 
 #define PRINT_ERR_STREAM       ctf_fs->error_fp
 #define PRINT_PREFIX           "ctf-fs"
@@ -85,13 +86,13 @@ enum bt_notification_iterator_status ctf_fs_iterator_init(
 
        ctf_fs = bt_private_component_get_user_data(priv_comp);
        if (!ctf_fs) {
-               ret = BT_NOTIFICATION_ITERATOR_STATUS_INVAL;
+               ret = BT_NOTIFICATION_ITERATOR_STATUS_INVALID;
                goto error;
        }
 
        port_data = bt_private_port_get_user_data(port);
        if (!port_data) {
-               ret = BT_NOTIFICATION_ITERATOR_STATUS_INVAL;
+               ret = BT_NOTIFICATION_ITERATOR_STATUS_INVALID;
                goto error;
        }
 
@@ -188,12 +189,6 @@ int create_one_port(struct ctf_fs_component *ctf_fs,
                port_name->str, stream_path);
 
        /* Create output port for this file */
-       port = bt_private_component_source_add_output_private_port(
-               ctf_fs->priv_comp, port_name->str);
-       if (!port) {
-               goto error;
-       }
-
        port_data = g_new0(struct ctf_fs_port_data, 1);
        if (!port_data) {
                goto error;
@@ -204,8 +199,9 @@ int create_one_port(struct ctf_fs_component *ctf_fs,
                goto error;
        }
 
-       ret = bt_private_port_set_user_data(port, port_data);
-       if (ret) {
+       port = bt_private_component_source_add_output_private_port(
+               ctf_fs->priv_comp, port_name->str, port_data);
+       if (!port) {
                goto error;
        }
 
@@ -346,8 +342,8 @@ int create_cc_prio_map(struct ctf_fs_component *ctf_fs)
 
        for (i = 0; i < count; i++) {
                struct bt_ctf_clock_class *clock_class =
-                       bt_ctf_trace_get_clock_class(ctf_fs->metadata->trace,
-                               i);
+                       bt_ctf_trace_get_clock_class_by_index(
+                               ctf_fs->metadata->trace, i);
 
                assert(clock_class);
                ret = bt_clock_class_priority_map_add_clock_class(
@@ -548,11 +544,12 @@ struct bt_value *ctf_fs_query(struct bt_component_class *comp_class,
                        goto error;
                }
 
-               is_packetized = ctf_metadata_is_packetized(metadata_fp, &bo);
+               is_packetized = ctf_metadata_decoder_is_packetized(metadata_fp,
+                       &bo);
 
                if (is_packetized) {
-                       ret = ctf_metadata_packetized_file_to_buf(NULL,
-                               metadata_fp, (uint8_t **) &metadata_text, bo);
+                       ret = ctf_metadata_decoder_packetized_file_stream_to_buf(
+                               metadata_fp, &metadata_text, bo);
                        if (ret) {
                                fprintf(stderr,
                                        "Cannot decode packetized metadata file\n");