ctf: allocate some structures with new

[babeltrace.git] / src / plugins / ctf / fs-src / metadata.hpp

diff --git a/src/plugins/ctf/fs-src/metadata.hpp b/src/plugins/ctf/fs-src/metadata.hpp
index 63dc30536730f8da6e85b61b155d0363bcea4eb4..bd8d2496aa7ea1b24f76d297cc7019745deeb1ae 100644 (file)
--- a/src/plugins/ctf/fs-src/metadata.hpp
+++ b/src/plugins/ctf/fs-src/metadata.hpp
@@ -7,38 +7,29 @@
 #ifndef CTF_FS_METADATA_H
 #define CTF_FS_METADATA_H
 
-#include <stdbool.h>
 #include <stdio.h>
-#include <glib.h>
-#include "common/macros.h"
-#include <babeltrace2/babeltrace.h>
 
-#define CTF_FS_METADATA_FILENAME       "metadata"
+#include <babeltrace2/babeltrace.h>
 
-struct ctf_fs_trace;
-struct ctf_fs_metadata;
+#define CTF_FS_METADATA_FILENAME "metadata"
 
-struct ctf_fs_metadata_config {
-       bool force_clock_class_origin_unix_epoch;
-       int64_t clock_class_offset_s;
-       int64_t clock_class_offset_ns;
+struct ctf_fs_metadata_config
+{
+    bool force_clock_class_origin_unix_epoch = false;
+    int64_t clock_class_offset_s = 0;
+    int64_t clock_class_offset_ns = 0;
 };
 
-BT_HIDDEN
 int ctf_fs_metadata_init(struct ctf_fs_metadata *metadata);
 
-BT_HIDDEN
 void ctf_fs_metadata_fini(struct ctf_fs_metadata *metadata);
 
-BT_HIDDEN
-int ctf_fs_metadata_set_trace_class(bt_self_component *self_comp,
-               struct ctf_fs_trace *ctf_fs_trace,
-               struct ctf_fs_metadata_config *config);
+int ctf_fs_metadata_set_trace_class(bt_self_component *self_comp, struct ctf_fs_trace *ctf_fs_trace,
+                                    struct ctf_fs_metadata_config *config);
 
-BT_HIDDEN
-FILE *ctf_fs_metadata_open_file(const char *trace_path);
+FILE *ctf_fs_metadata_open_file(const char *trace_path, bt_logging_level log_level,
+                                bt_self_component_class *comp_class);
 
-BT_HIDDEN
 bool ctf_metadata_is_packetized(FILE *fp, int *byte_order);
 
 #endif /* CTF_FS_METADATA_H */