Remove some unused includes in C++ files

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

diff --git a/src/plugins/ctf/fs-sink/fs-sink-stream.cpp b/src/plugins/ctf/fs-sink/fs-sink-stream.cpp
index 6e3bfb36226747ec86b593903705ad94474075e2..d56180b14ed7bb0819bc80da903df7077ee9bd7c 100644 (file)
--- a/src/plugins/ctf/fs-sink/fs-sink-stream.cpp
+++ b/src/plugins/ctf/fs-sink/fs-sink-stream.cpp
@@ -4,22 +4,24 @@
  * Copyright 2019 Philippe Proulx <pproulx@efficios.com>
  */
 
+#include <glib.h>
+#include <stdio.h>
+
+#include <babeltrace2/babeltrace.h>
+
 #define BT_COMP_LOG_SELF_COMP (stream->trace->fs_sink->self_comp)
 #define BT_LOG_OUTPUT_LEVEL   (stream->log_level)
 #define BT_LOG_TAG            "PLUGIN/SINK.CTF.FS/STREAM"
 #include "logging/comp-logging.h"
 
-#include <babeltrace2/babeltrace.h>
-#include <stdio.h>
-#include <stdbool.h>
-#include <glib.h>
 #include "common/assert.h"
-#include "ctfser/ctfser.h"
 #include "compat/endian.h"
+#include "ctfser/ctfser.h"
 
-#include "fs-sink.hpp"
-#include "fs-sink-trace.hpp"
+#include "fs-sink-ctf-meta.hpp"
 #include "fs-sink-stream.hpp"
+#include "fs-sink-trace.hpp"
+#include "fs-sink.hpp"
 #include "translate-trace-ir-to-ctf-ir.hpp"
 
 void fs_sink_stream_destroy(struct fs_sink_stream *stream)
@@ -228,9 +230,7 @@ static inline int write_float_field(struct fs_sink_stream *stream,
     return ret;
 }
 
-static inline int write_string_field(struct fs_sink_stream *stream,
-                                     struct fs_sink_ctf_field_class_string *fc,
-                                     const bt_field *field)
+static inline int write_string_field(struct fs_sink_stream *stream, const bt_field *field)
 {
     return bt_ctfser_write_string(&stream->ctfser, bt_field_string_get_value(field));
 }
@@ -377,7 +377,7 @@ static int write_field(struct fs_sink_stream *stream, struct fs_sink_ctf_field_c
         ret = write_float_field(stream, fs_sink_ctf_field_class_as_float(fc), field);
         break;
     case FS_SINK_CTF_FIELD_CLASS_TYPE_STRING:
-        ret = write_string_field(stream, fs_sink_ctf_field_class_as_string(fc), field);
+        ret = write_string_field(stream, field);
         break;
     case FS_SINK_CTF_FIELD_CLASS_TYPE_STRUCT:
         ret = write_struct_field(stream, fs_sink_ctf_field_class_as_struct(fc), field, true);