sink.text.pretty: abort on unknown field class type

[babeltrace.git] / src / plugins / ctf / common / bfcr / bfcr.cpp

diff --git a/src/plugins/ctf/common/bfcr/bfcr.cpp b/src/plugins/ctf/common/bfcr/bfcr.cpp
index 3c204b6a3a20287b9918bc480b56fe33531c6cae..f59f65d0f2f076041982281a1fbd062a2351bcfc 100644 (file)
--- a/src/plugins/ctf/common/bfcr/bfcr.cpp
+++ b/src/plugins/ctf/common/bfcr/bfcr.cpp
@@ -7,27 +7,26 @@
  * Babeltrace - CTF binary field class reader (BFCR)
  */
 
+#include <glib.h>
+#include <inttypes.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <string.h>
+
+#include <babeltrace2/babeltrace.h>
+
 #define BT_COMP_LOG_SELF_COMP (bfcr->self_comp)
 #define BT_LOG_OUTPUT_LEVEL   (bfcr->log_level)
 #define BT_LOG_TAG            "PLUGIN/CTF/BFCR"
 #include "logging/comp-logging.h"
 
-#include <stdlib.h>
-#include <stdint.h>
-#include <inttypes.h>
-#include <stdio.h>
-#include <stddef.h>
-#include <stdbool.h>
+#include "common/align.h"
 #include "common/assert.h"
-#include <string.h>
-#include "compat/bitfield.h"
 #include "common/common.h"
-#include <babeltrace2/babeltrace.h>
-#include "common/align.h"
-#include <glib.h>
+#include "compat/bitfield.h"
 
-#include "bfcr.hpp"
 #include "../metadata/ctf-meta.hpp"
+#include "bfcr.hpp"
 
 #define DIV8(_x)                ((_x) >> 3)
 #define BYTES_TO_BITS(_x)       ((_x) *8)
@@ -55,8 +54,6 @@ struct stack_entry
     int64_t index;
 };
 
-struct bt_bfcr;
-
 /* Visit stack */
 struct stack
 {
@@ -238,7 +235,7 @@ static int stack_push(struct stack *stack, struct ctf_field_class *base_class, s
         g_array_set_size(stack->entries, stack->size + 1);
     }
 
-    entry = &g_array_index(stack->entries, struct stack_entry, stack->size);
+    entry = &bt_g_array_index(stack->entries, struct stack_entry, stack->size);
     entry->base_class = base_class;
     entry->base_len = base_len;
     entry->index = 0;
@@ -335,7 +332,7 @@ static inline struct stack_entry *stack_top(struct stack *stack)
 {
     BT_ASSERT_DBG(stack);
     BT_ASSERT_DBG(stack_size(stack));
-    return &g_array_index(stack->entries, struct stack_entry, stack->size - 1);
+    return &bt_g_array_index(stack->entries, struct stack_entry, stack->size - 1);
 }
 
 static inline size_t available_bits(struct bt_bfcr *bfcr)