X-Git-Url: https://git.efficios.com/?a=blobdiff_plain;f=src%2Fplugins%2Fctf%2Fcommon%2Fmsg-iter%2Fmsg-iter.cpp;h=33ad4a27afacab558566cb7ef19c29d0f3042d4a;hb=507d9140a9f7fba601a53b9ae210f82e8cc3f041;hp=38305c84455fed8dcbb2cf667c095d0a320085df;hpb=c802cacb9f0879a42e01575595a75bbefe7d3db9;p=babeltrace.git

diff --git a/src/plugins/ctf/common/msg-iter/msg-iter.cpp b/src/plugins/ctf/common/msg-iter/msg-iter.cpp
index 38305c84..33ad4a27 100644
--- a/src/plugins/ctf/common/msg-iter/msg-iter.cpp
+++ b/src/plugins/ctf/common/msg-iter/msg-iter.cpp
@@ -9,12 +9,9 @@
 
 #include <glib.h>
 #include <inttypes.h>
-#include <stdbool.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 
 #include <babeltrace2/babeltrace.h>
 
@@ -28,8 +25,7 @@
 
 #include "../bfcr/bfcr.hpp"
 #include "msg-iter.hpp"
-
-struct ctf_msg_iter;
+#include "plugins/ctf/common/metadata/ctf-meta.hpp"
 
 /* A visit stack entry */
 struct stack_entry
@@ -51,8 +47,6 @@ struct stack_entry
     size_t index;
 };
 
-struct ctf_msg_iter;
-
 /* Visit stack */
 struct stack
 {
@@ -1797,7 +1791,7 @@ end:
 
 /*
  * Ensure the message iterator's `stored_values` array is large enough to
- * accomodate `storing_index`.
+ * accommodate `storing_index`.
  *
  * We may need more slots in the array than initially allocated if more
  * metadata arrives along the way.
@@ -2747,7 +2741,7 @@ enum ctf_msg_iter_status ctf_msg_iter_get_next_message(struct ctf_msg_iter *msg_
             }
             goto end;
         case STATE_EMIT_MSG_DISCARDED_EVENTS:
-            /* create_msg_discared_events() logs errors */
+            /* create_msg_discarded_events() logs errors */
             *message = create_msg_discarded_events(msg_it);
 
             if (!*message) {
@@ -2756,7 +2750,7 @@ enum ctf_msg_iter_status ctf_msg_iter_get_next_message(struct ctf_msg_iter *msg_
 
             goto end;
         case STATE_EMIT_MSG_DISCARDED_PACKETS:
-            /* create_msg_discared_packets() logs errors */
+            /* create_msg_discarded_packets() logs errors */
             *message = create_msg_discarded_packets(msg_it);
 
             if (!*message) {