X-Git-Url: https://git.efficios.com/?a=blobdiff_plain;f=src%2Fplugins%2Fctf%2Ffs-sink%2Ffs-sink-trace.hpp;h=a85966ca84ee53d7b78f16bd580465d4acbc3b9e;hb=150640e86f21b86c92aac2ac2d0cd8333a1005bd;hp=0f2bdb4c867b88599e460809d2621d6b6ed218dd;hpb=1353b066072e6c389ff35853bac83f65597e7a6a;p=babeltrace.git

diff --git a/src/plugins/ctf/fs-sink/fs-sink-trace.hpp b/src/plugins/ctf/fs-sink/fs-sink-trace.hpp
index 0f2bdb4c..a85966ca 100644
--- a/src/plugins/ctf/fs-sink/fs-sink-trace.hpp
+++ b/src/plugins/ctf/fs-sink/fs-sink-trace.hpp
@@ -7,23 +7,20 @@
 #ifndef BABELTRACE_PLUGIN_CTF_FS_SINK_FS_SINK_TRACE_H
 #define BABELTRACE_PLUGIN_CTF_FS_SINK_FS_SINK_TRACE_H
 
-#include "common/macros.h"
-#include <babeltrace2/babeltrace.h>
-#include "ctfser/ctfser.h"
 #include <glib.h>
-#include <stdint.h>
 
-#include "fs-sink-ctf-meta.hpp"
+#include <babeltrace2/babeltrace.h>
 
 struct fs_sink_comp;
+struct fs_sink_ctf_trace;
 
 struct fs_sink_trace
 {
-    bt_logging_level log_level;
-    struct fs_sink_comp *fs_sink;
+    bt_logging_level log_level = BT_LOGGING_LEVEL_NONE;
+    fs_sink_comp *fs_sink = nullptr;
 
     /* Owned by this */
-    struct fs_sink_ctf_trace *trace;
+    fs_sink_ctf_trace *trace = nullptr;
 
     /*
      * Weak reference: this object does not own it, and `trace`
@@ -37,21 +34,21 @@ struct fs_sink_trace
      * could "leak" resources (memory, file descriptors) associated
      * to traces and streams which otherwise would not exist.
      */
-    const bt_trace *ir_trace;
+    const bt_trace *ir_trace = nullptr;
 
-    bt_listener_id ir_trace_destruction_listener_id;
+    bt_listener_id ir_trace_destruction_listener_id = 0;
 
     /* Trace's directory */
-    GString *path;
+    GString *path = nullptr;
 
     /* `metadata` file path */
-    GString *metadata_path;
+    GString *metadata_path = nullptr;
 
     /*
      * Hash table of `const bt_stream *` (weak) to
      * `struct fs_sink_stream *` (owned by hash table).
      */
-    GHashTable *streams;
+    GHashTable *streams = nullptr;
 };
 
 struct fs_sink_trace *fs_sink_trace_create(struct fs_sink_comp *fs_sink, const bt_trace *ir_trace);