X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fplugins%2Fctf%2Flttng-live%2Flttng-live.cpp;h=35cbff95eb713d66a9f67be072d6472bee751b84;hb=e74015680521597497c3218160a9e80081932896;hp=be6d7ba97adfacb0907c3493db9943e8d56c582a;hpb=1353b066072e6c389ff35853bac83f65597e7a6a;p=babeltrace.git

diff --git a/src/plugins/ctf/lttng-live/lttng-live.cpp b/src/plugins/ctf/lttng-live/lttng-live.cpp
index be6d7ba9..35cbff95 100644
--- a/src/plugins/ctf/lttng-live/lttng-live.cpp
+++ b/src/plugins/ctf/lttng-live/lttng-live.cpp
@@ -8,28 +8,25 @@
  * Babeltrace CTF LTTng-live Client Component
  */
 
+#include <glib.h>
+#include <inttypes.h>
+#include <unistd.h>
+
+#include <babeltrace2/babeltrace.h>
+
 #define BT_COMP_LOG_SELF_COMP self_comp
 #define BT_LOG_OUTPUT_LEVEL   log_level
 #define BT_LOG_TAG            "PLUGIN/SRC.CTF.LTTNG-LIVE"
 #include "logging/comp-logging.h"
 
-#include <inttypes.h>
-#include <stdbool.h>
-#include <unistd.h>
-
-#include <glib.h>
-
 #include "common/assert.h"
-#include <babeltrace2/babeltrace.h>
-#include "compat/compiler.h"
-#include <babeltrace2/types.h>
 
 #include "plugins/common/muxing/muxing.h"
 #include "plugins/common/param-validation/param-validation.h"
 
 #include "data-stream.hpp"
-#include "metadata.hpp"
 #include "lttng-live.hpp"
+#include "metadata.hpp"
 
 #define MAX_QUERY_SIZE                     (256 * 1024)
 #define URL_PARAM                          "url"
@@ -720,8 +717,7 @@ end:
     return ret;
 }
 
-static int live_get_msg_ts_ns(struct lttng_live_stream_iterator *stream_iter,
-                              struct lttng_live_msg_iter *lttng_live_msg_iter,
+static int live_get_msg_ts_ns(struct lttng_live_msg_iter *lttng_live_msg_iter,
                               const bt_message *msg, int64_t last_msg_ts_ns, int64_t *ts_ns)
 {
     const bt_clock_snapshot *clock_snapshot = NULL;
@@ -1113,7 +1109,7 @@ handle_late_message(struct lttng_live_msg_iter *lttng_live_msg_iter,
      * by this component. We CANNOT send it as is.
      *
      * The only expected scenario in which that could happen is the
-     * following, everything else is a bug in this component, relay deamon,
+     * following, everything else is a bug in this component, relay daemon,
      * or CTF parser.
      *
      * Expected scenario: The CTF message iterator emitted discarded
@@ -1280,10 +1276,10 @@ next_stream_iterator_for_trace(struct lttng_live_msg_iter *lttng_live_msg_iter,
 
             /*
              * Get the timestamp in nanoseconds from origin of this
-             * messsage.
+             * message.
              */
-            live_get_msg_ts_ns(stream_iter, lttng_live_msg_iter, msg,
-                               lttng_live_msg_iter->last_msg_ts_ns, &curr_msg_ts_ns);
+            live_get_msg_ts_ns(lttng_live_msg_iter, msg, lttng_live_msg_iter->last_msg_ts_ns,
+                               &curr_msg_ts_ns);
 
             /*
              * Check if the message of the current live stream
@@ -1688,7 +1684,7 @@ lttng_live_msg_iter_next(bt_self_message_iterator *self_msg_it, bt_message_array
 
         /*
          * Insert the next message to the message batch. This will set
-         * stream iterator current messsage to NULL so that next time
+         * stream iterator current message to NULL so that next time
          * we fetch the next message of that stream iterator
          */
         BT_MESSAGE_MOVE_REF(msgs[*count], youngest_stream_iter->current_msg);
@@ -1708,7 +1704,7 @@ return_status:
         /*
          * If we gathered messages, return _OK even if the graph was
          * interrupted. This allows for the components downstream to at
-         * least get the thoses messages. If the graph was indeed
+         * least get the those messages. If the graph was indeed
          * interrupted there should not be another _next() call as the
          * application will tear down the graph. This component class
          * doesn't support restarting after an interruption.
@@ -1781,8 +1777,7 @@ end:
 
 bt_message_iterator_class_initialize_method_status
 lttng_live_msg_iter_init(bt_self_message_iterator *self_msg_it,
-                         bt_self_message_iterator_configuration *config,
-                         bt_self_component_port_output *self_port)
+                         bt_self_message_iterator_configuration *, bt_self_component_port_output *)
 {
     bt_message_iterator_class_initialize_method_status status;
     struct lttng_live_component *lttng_live;
@@ -1958,7 +1953,7 @@ lttng_live_query_support_info(const bt_value *params, const bt_value **result,
     const bt_value *input_type_value;
     const bt_value *input_value;
     double weight = 0;
-    struct bt_common_lttng_live_url_parts parts = {0};
+    struct bt_common_lttng_live_url_parts parts = {};
 
     /* Used by the logging macros */
     __attribute__((unused)) bt_self_component *self_comp = NULL;
@@ -2173,8 +2168,7 @@ end:
 
 bt_component_class_initialize_method_status
 lttng_live_component_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_self_component_source_configuration *, const bt_value *params, void *)
 {
     struct lttng_live_component *lttng_live;
     bt_component_class_initialize_method_status ret;