Add bt_common_abort() and use it instead of abort() directly

[babeltrace.git] / src / plugins / ctf / fs-sink / translate-ctf-ir-to-tsdl.c

diff --git a/src/plugins/ctf/fs-sink/translate-ctf-ir-to-tsdl.c b/src/plugins/ctf/fs-sink/translate-ctf-ir-to-tsdl.c
index a975be3789c422e003d1fc2f9f9dda9c236dce3c..bfab450c2c4035ee82d9608db5099d574393da2b 100644 (file)
--- a/src/plugins/ctf/fs-sink/translate-ctf-ir-to-tsdl.c
+++ b/src/plugins/ctf/fs-sink/translate-ctf-ir-to-tsdl.c
@@ -20,6 +20,8 @@
  * SOFTWARE.
  */
 
+#include "translate-ctf-ir-to-tsdl.h"
+
 #include <babeltrace2/babeltrace.h>
 #include "common/macros.h"
 #include <stdio.h>
@@ -136,7 +138,7 @@ void append_integer_field_class_from_props(struct ctx *ctx, unsigned int size,
                        g_string_append(ctx->tsdl, "x");
                        break;
                default:
-                       abort();
+                       bt_common_abort();
                }
 
                g_string_append_c(ctx->tsdl, ';');
@@ -481,14 +483,14 @@ void append_struct_field_class_members(struct ctx *ctx,
                                ctx->indent_level++;
 
                                for (i = 0; i < var_fc->options->len; i++) {
-                                       struct fs_sink_ctf_named_field_class *named_fc =
+                                       struct fs_sink_ctf_named_field_class *option_named_fc =
                                                fs_sink_ctf_field_class_variant_borrow_option_by_index(
                                                        var_fc, i);
 
                                        append_indent(ctx);
                                        g_string_append_printf(ctx->tsdl,
                                                "\"%s\" = %" PRIu64 ",\n",
-                                               named_fc->name->str, i);
+                                               option_named_fc->name->str, i);
                                }
 
                                append_end_block(ctx);
@@ -587,7 +589,7 @@ void append_field_class(struct ctx *ctx, struct fs_sink_ctf_field_class *fc)
                append_variant_field_class(ctx, (void *) fc);
                break;
        default:
-               abort();
+               bt_common_abort();
        }
 }
 
@@ -681,7 +683,7 @@ void append_event_class(struct ctx *ctx, struct fs_sink_ctf_event_class *ec)
                        level = 14;
                        break;
                default:
-                       abort();
+                       bt_common_abort();
                }
 
                g_string_append_printf(ctx->tsdl, "%u;\n", level);
@@ -974,7 +976,7 @@ void translate_trace_ctf_ir_to_tsdl(struct fs_sink_ctf_trace *trace,
                                 * This is checked in
                                 * translate_trace_trace_ir_to_ctf_ir().
                                 */
-                               abort();
+                               bt_common_abort();
                        }
 
                        g_string_append(tsdl, ";\n");