ctf: allocate some structures with new

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

diff --git a/src/plugins/ctf/fs-src/query.cpp b/src/plugins/ctf/fs-src/query.cpp
index 3e9c2a676099ea103ed8c0b40c48888aea50e160..c2f6253d3b8d2d84cda48e29201ccf31e32687d6 100644 (file)
--- a/src/plugins/ctf/fs-src/query.cpp
+++ b/src/plugins/ctf/fs-src/query.cpp
@@ -6,25 +6,20 @@
  * Babeltrace CTF file system Reader Component queries
  */
 
-#include <fcntl.h>
 #include <glib.h>
 #include <glib/gstdio.h>
-#include <stdbool.h>
-#include <sys/stat.h>
 #include <sys/types.h>
 
 #include <babeltrace2/babeltrace.h>
 
-#define BT_LOG_OUTPUT_LEVEL log_level
+#define BT_LOG_OUTPUT_LEVEL ((enum bt_log_level) log_level)
 #define BT_LOG_TAG          "PLUGIN/SRC.CTF.FS/QUERY"
 #include "logging/comp-logging.h"
 #include "logging/log.h"
 
 #include "common/assert.h"
-#include "common/common.h"
-#include "common/macros.h"
 
-#include "../common/metadata/decoder.hpp"
+#include "../common/src/metadata/tsdl/decoder.hpp"
 #include "fs.hpp"
 #include "metadata.hpp"
 #include "query.hpp"
@@ -53,7 +48,7 @@ metadata_info_query(bt_self_component_class_source *self_comp_class_src, const b
     const char *path;
     bool is_packetized;
     struct ctf_metadata_decoder *decoder = NULL;
-    ctf_metadata_decoder_config decoder_cfg {};
+    ctf_metadata_decoder_config decoder_cfg;
     enum ctf_metadata_decoder_status decoder_status;
     GString *g_metadata_text = NULL;
     const char *plaintext;
@@ -170,7 +165,7 @@ end:
     if (metadata_fp) {
         ret = fclose(metadata_fp);
         if (ret) {
-            BT_LOGE_ERRNO("Cannot close metatada file stream", ": path=\"%s\"", path);
+            BT_LOGE_ERRNO("Cannot close metadata file stream", ": path=\"%s\"", path);
         }
     }
 
@@ -433,10 +428,10 @@ support_info_query(bt_self_component_class_source *comp_class, const bt_value *p
 
     metadata_file = g_fopen(metadata_path, "rb");
     if (metadata_file) {
-        ctf_metadata_decoder_config metadata_decoder_config {};
         enum ctf_metadata_decoder_status decoder_status;
         bt_uuid_t uuid;
 
+        ctf_metadata_decoder_config metadata_decoder_config;
         metadata_decoder_config.log_level = log_level;
         metadata_decoder_config.self_comp_class =
             bt_self_component_class_source_as_self_component_class(comp_class);