Fix typos

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

diff --git a/src/plugins/ctf/fs-src/fs.cpp b/src/plugins/ctf/fs-src/fs.cpp
index 5cdabcadf798e2028cbaf8499ce801c86f68b639..5306b421dc98d3254d87656260d9b159a7c572df 100644 (file)
--- a/src/plugins/ctf/fs-src/fs.cpp
+++ b/src/plugins/ctf/fs-src/fs.cpp
@@ -7,27 +7,30 @@
  * Babeltrace CTF file system Reader Component
  */
 
+#include <glib.h>
+#include <inttypes.h>
+
+#include <babeltrace2/babeltrace.h>
+
 #define BT_COMP_LOG_SELF_COMP self_comp
-#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"
 #include "logging/comp-logging.h"
 
+#include "common/assert.h"
 #include "common/common.h"
-#include <babeltrace2/babeltrace.h>
 #include "common/uuid.h"
-#include <glib.h>
-#include "common/assert.h"
-#include <inttypes.h>
-#include <stdbool.h>
-#include "fs.hpp"
-#include "metadata.hpp"
-#include "data-stream-file.hpp"
-#include "file.hpp"
-#include "../common/metadata/decoder.hpp"
+
+#include "plugins/common/param-validation/param-validation.h"
+
 #include "../common/metadata/ctf-meta-configure-ir-trace.hpp"
 #include "../common/msg-iter/msg-iter.hpp"
+#include "data-stream-file.hpp"
+#include "file.hpp"
+#include "fs.hpp"
+#include "metadata.hpp"
+#include "plugins/ctf/common/metadata/ctf-meta.hpp"
 #include "query.hpp"
-#include "plugins/common/param-validation/param-validation.h"
 
 struct tracer_info
 {
@@ -100,7 +103,6 @@ ctf_fs_iterator_next_one(struct ctf_fs_msg_iter_data *msg_iter_data, const bt_me
     return status;
 }
 
-BT_HIDDEN
 bt_message_iterator_class_next_method_status
 ctf_fs_iterator_next(bt_self_message_iterator *iterator, bt_message_array_const msgs,
                      uint64_t capacity, uint64_t *count)
@@ -135,7 +137,7 @@ ctf_fs_iterator_next(bt_self_message_iterator *iterator, bt_message_array_const
          * accumulated message objects in the output
          * message array, so we need to return
          * BT_MESSAGE_ITERATOR_NEXT_METHOD_STATUS_OK so that they are
-         * transfered to downstream. This other status occurs
+         * transferred to downstream. This other status occurs
          * again the next time muxer_msg_iter_do_next() is
          * called, possibly without any accumulated
          * message, in which case we'll return it.
@@ -160,7 +162,6 @@ end:
     return status;
 }
 
-BT_HIDDEN
 bt_message_iterator_class_seek_beginning_method_status
 ctf_fs_iterator_seek_beginning(bt_self_message_iterator *it)
 {
@@ -175,7 +176,6 @@ ctf_fs_iterator_seek_beginning(bt_self_message_iterator *it)
     return BT_MESSAGE_ITERATOR_CLASS_SEEK_BEGINNING_METHOD_STATUS_OK;
 }
 
-BT_HIDDEN
 void ctf_fs_iterator_finalize(bt_self_message_iterator *it)
 {
     ctf_fs_msg_iter_data_destroy(
@@ -199,7 +199,6 @@ ctf_msg_iter_medium_status_to_msg_iter_initialize_status(enum ctf_msg_iter_mediu
     bt_common_abort();
 }
 
-BT_HIDDEN
 bt_message_iterator_class_initialize_method_status
 ctf_fs_iterator_init(bt_self_message_iterator *self_msg_iter,
                      bt_self_message_iterator_configuration *config,
@@ -295,7 +294,6 @@ static void ctf_fs_trace_destroy(struct ctf_fs_trace *ctf_fs_trace)
     g_free(ctf_fs_trace);
 }
 
-BT_HIDDEN
 void ctf_fs_destroy(struct ctf_fs_component *ctf_fs)
 {
     if (!ctf_fs) {
@@ -331,8 +329,7 @@ static void ctf_fs_trace_destroy_notifier(void *data)
     ctf_fs_trace_destroy(trace);
 }
 
-struct ctf_fs_component *ctf_fs_component_create(bt_logging_level log_level,
-                                                 bt_self_component *self_comp)
+struct ctf_fs_component *ctf_fs_component_create(bt_logging_level log_level)
 {
     struct ctf_fs_component *ctf_fs;
 
@@ -408,7 +405,6 @@ gchar *ctf_fs_make_port_name(struct ctf_fs_ds_file_group *ds_file_group)
 }
 
 static int create_one_port_for_trace(struct ctf_fs_component *ctf_fs,
-                                     struct ctf_fs_trace *ctf_fs_trace,
                                      struct ctf_fs_ds_file_group *ds_file_group,
                                      bt_self_component_source *self_comp_src)
 {
@@ -466,7 +462,7 @@ static int create_ports_for_trace(struct ctf_fs_component *ctf_fs,
         struct ctf_fs_ds_file_group *ds_file_group =
             (struct ctf_fs_ds_file_group *) g_ptr_array_index(ctf_fs_trace->ds_file_groups, i);
 
-        ret = create_one_port_for_trace(ctf_fs, ctf_fs_trace, ds_file_group, self_comp_src);
+        ret = create_one_port_for_trace(ctf_fs, ds_file_group, self_comp_src);
         if (ret) {
             BT_COMP_LOGE_APPEND_CAUSE(self_comp, "Cannot create output port.");
             goto end;
@@ -703,7 +699,7 @@ static int add_ds_file_to_ds_file_group(struct ctf_fs_trace *ctf_fs_trace, const
      * Create a temporary ds_file to read some properties about the data
      * stream file.
      */
-    ds_file = ctf_fs_ds_file_create(ctf_fs_trace, NULL, NULL, path, log_level);
+    ds_file = ctf_fs_ds_file_create(ctf_fs_trace, NULL, path, log_level);
     if (!ds_file) {
         goto error;
     }
@@ -1379,7 +1375,7 @@ static int decode_clock_snapshot_after_event(struct ctf_fs_trace *ctf_fs_trace,
     BT_ASSERT(index_entry);
     BT_ASSERT(index_entry->path);
 
-    ds_file = ctf_fs_ds_file_create(ctf_fs_trace, NULL, NULL, index_entry->path, log_level);
+    ds_file = ctf_fs_ds_file_create(ctf_fs_trace, NULL, index_entry->path, log_level);
     if (!ds_file) {
         BT_COMP_LOGE_APPEND_CAUSE(self_comp, "Failed to create a ctf_fs_ds_file");
         ret = -1;
@@ -2263,7 +2259,7 @@ static struct ctf_fs_component *ctf_fs_create(const bt_value *params,
     bt_self_component *self_comp = bt_self_component_source_as_self_component(self_comp_src);
 
     ctf_fs = ctf_fs_component_create(
-        bt_component_get_logging_level(bt_self_component_as_component(self_comp)), self_comp);
+        bt_component_get_logging_level(bt_self_component_as_component(self_comp)));
     if (!ctf_fs) {
         goto error;
     }
@@ -2299,10 +2295,9 @@ end:
     return ctf_fs;
 }
 
-BT_HIDDEN
-bt_component_class_initialize_method_status
-ctf_fs_init(bt_self_component_source *self_comp_src, bt_self_component_source_configuration *config,
-            const bt_value *params, __attribute__((unused)) void *init_method_data)
+bt_component_class_initialize_method_status ctf_fs_init(bt_self_component_source *self_comp_src,
+                                                        bt_self_component_source_configuration *,
+                                                        const bt_value *params, void *)
 {
     struct ctf_fs_component *ctf_fs;
     bt_component_class_initialize_method_status ret =
@@ -2316,7 +2311,6 @@ ctf_fs_init(bt_self_component_source *self_comp_src, bt_self_component_source_co
     return ret;
 }
 
-BT_HIDDEN
 bt_component_class_query_method_status ctf_fs_query(bt_self_component_class_source *comp_class,
                                                     bt_private_query_executor *priv_query_exec,
                                                     const char *object, const bt_value *params,