Fix: check for NULL in destroy_pretty_data

[babeltrace.git] / src / plugins / ctf / fs-src / query.c

diff --git a/src/plugins/ctf/fs-src/query.c b/src/plugins/ctf/fs-src/query.c
index cc58872c8092d480c9cb64de4293c4342bed2034..3deb0cb18f6b7d324b7fb78b75d9d36e9759ffd5 100644 (file)
--- a/src/plugins/ctf/fs-src/query.c
+++ b/src/plugins/ctf/fs-src/query.c
@@ -294,7 +294,7 @@ int populate_trace_info(const struct ctf_fs_trace *trace, bt_value *trace_info)
        }
 
        insert_status = bt_value_map_insert_empty_array_entry(trace_info,
-               "streams", &file_groups);
+               "stream-infos", &file_groups);
        if (insert_status != BT_VALUE_MAP_INSERT_ENTRY_STATUS_OK) {
                ret = -1;
                goto end;
@@ -326,7 +326,7 @@ end:
 }
 
 BT_HIDDEN
-bt_component_class_query_method_status trace_info_query(
+bt_component_class_query_method_status trace_infos_query(
                bt_self_component_class_source *self_comp_class_src,
                const bt_value *params, bt_logging_level log_level,
                const bt_value **user_result)
@@ -339,6 +339,7 @@ bt_component_class_query_method_status trace_info_query(
                        self_comp_class_src);
        bt_value *result = NULL;
        const bt_value *inputs_value = NULL;
+       const bt_value *trace_name_value;
        int ret = 0;
        bt_value *trace_info = NULL;
        bt_value_array_append_element_status append_status;
@@ -357,14 +358,14 @@ bt_component_class_query_method_status trace_info_query(
                goto error;
        }
 
-       if (!read_src_fs_parameters(params, &inputs_value, ctf_fs, NULL,
-                       self_comp_class)) {
+       if (!read_src_fs_parameters(params, &inputs_value, &trace_name_value,
+                       ctf_fs, NULL, self_comp_class)) {
                status = BT_COMPONENT_CLASS_QUERY_METHOD_STATUS_ERROR;
                goto error;
        }
 
-       if (ctf_fs_component_create_ctf_fs_trace(ctf_fs, inputs_value, NULL,
-                       self_comp_class)) {
+       if (ctf_fs_component_create_ctf_fs_trace(ctf_fs, inputs_value,
+                       trace_name_value, NULL, self_comp_class)) {
                goto error;
        }
 
@@ -446,7 +447,7 @@ bt_component_class_query_method_status support_info_query(
                goto end;
        }
 
-       metadata_file = g_fopen(metadata_path, "r");
+       metadata_file = g_fopen(metadata_path, "rb");
        if (metadata_file) {
                struct ctf_metadata_decoder_config metadata_decoder_config = { 0 };
                enum ctf_metadata_decoder_status decoder_status;