Use the same values for different status codes

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

diff --git a/plugins/ctf/fs/fs.c b/plugins/ctf/fs/fs.c
index ece7ff97cbe1e0a9fdfa19ee18c286134d7beda4..808f9ccfeb3bf1f437f3b29e88d5b8dd2befa5dc 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;
        }
 
@@ -548,11 +549,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");