X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fplugins%2Fctf%2Ffs-sink%2Ffs-sink-ctf-meta.h;h=e2045da3f9feba5813befac10696fd8c0df11cc9;hb=0235b0db7de5bcacdb3650c92461f2ce5eb2143d;hp=b73c810d5338623313981ea33d6aa5018f988aad;hpb=de821fe507f035622c474f097b226f30cd3c7491;p=babeltrace.git

diff --git a/src/plugins/ctf/fs-sink/fs-sink-ctf-meta.h b/src/plugins/ctf/fs-sink/fs-sink-ctf-meta.h
index b73c810d..e2045da3 100644
--- a/src/plugins/ctf/fs-sink/fs-sink-ctf-meta.h
+++ b/src/plugins/ctf/fs-sink/fs-sink-ctf-meta.h
@@ -1,20 +1,12 @@
-#ifndef BABELTRACE_PLUGIN_CTF_FS_SINK_FS_SINK_CTF_META_H
-#define BABELTRACE_PLUGIN_CTF_FS_SINK_FS_SINK_CTF_META_H
-
 /*
- * Copyright 2018-2019 - Philippe Proulx <pproulx@efficios.com>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
+ * SPDX-License-Identifier: MIT
  *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
+ * Copyright 2018-2019 Philippe Proulx <pproulx@efficios.com>
  */
 
+#ifndef BABELTRACE_PLUGIN_CTF_FS_SINK_FS_SINK_CTF_META_H
+#define BABELTRACE_PLUGIN_CTF_FS_SINK_FS_SINK_CTF_META_H
+
 #include <babeltrace2/babeltrace.h>
 #include "common/common.h"
 #include "common/assert.h"
@@ -221,8 +213,8 @@ void _fs_sink_ctf_field_class_int_init(struct fs_sink_ctf_field_class_int *fc,
 		(unsigned int) bt_field_class_integer_get_field_value_range(
 			ir_fc),
 		index_in_parent);
-	fc->is_signed = (ir_fc_type == BT_FIELD_CLASS_TYPE_SIGNED_INTEGER ||
-		ir_fc_type == BT_FIELD_CLASS_TYPE_SIGNED_ENUMERATION);
+	fc->is_signed = bt_field_class_type_is(ir_fc_type,
+		BT_FIELD_CLASS_TYPE_SIGNED_INTEGER);
 }
 
 static inline
@@ -308,7 +300,8 @@ struct fs_sink_ctf_field_class_float *fs_sink_ctf_field_class_float_create(
 	_fs_sink_ctf_field_class_bit_array_init((void *) fc,
 		FS_SINK_CTF_FIELD_CLASS_TYPE_FLOAT,
 		ir_fc,
-		bt_field_class_get_type(ir_fc) == BT_FIELD_CLASS_TYPE_SINGLE_PRECISION_REAL ? 32 : 64,
+		bt_field_class_get_type(ir_fc) ==
+			BT_FIELD_CLASS_TYPE_SINGLE_PRECISION_REAL ? 32 : 64,
 		index_in_parent);
 	return fc;
 }
@@ -620,7 +613,7 @@ void fs_sink_ctf_field_class_destroy(struct fs_sink_ctf_field_class *fc)
 		_fs_sink_ctf_field_class_variant_destroy((void *) fc);
 		break;
 	default:
-		abort();
+		bt_common_abort();
 	}
 }
 
@@ -629,8 +622,8 @@ struct fs_sink_ctf_named_field_class *
 fs_sink_ctf_field_class_struct_borrow_member_by_index(
 		struct fs_sink_ctf_field_class_struct *fc, uint64_t index)
 {
-	BT_ASSERT(fc);
-	BT_ASSERT(index < fc->members->len);
+	BT_ASSERT_DBG(fc);
+	BT_ASSERT_DBG(index < fc->members->len);
 	return &g_array_index(fc->members, struct fs_sink_ctf_named_field_class,
 		index);
 }
@@ -643,8 +636,8 @@ fs_sink_ctf_field_class_struct_borrow_member_by_name(
 	uint64_t i;
 	struct fs_sink_ctf_named_field_class *ret_named_fc = NULL;
 
-	BT_ASSERT(fc);
-	BT_ASSERT(name);
+	BT_ASSERT_DBG(fc);
+	BT_ASSERT_DBG(name);
 
 	for (i = 0; i < fc->members->len; i++) {
 		struct fs_sink_ctf_named_field_class *named_fc =
@@ -743,8 +736,8 @@ struct fs_sink_ctf_named_field_class *
 fs_sink_ctf_field_class_variant_borrow_option_by_index(
 		struct fs_sink_ctf_field_class_variant *fc, uint64_t index)
 {
-	BT_ASSERT(fc);
-	BT_ASSERT(index < fc->options->len);
+	BT_ASSERT_DBG(fc);
+	BT_ASSERT_DBG(index < fc->options->len);
 	return &g_array_index(fc->options, struct fs_sink_ctf_named_field_class,
 		index);
 }
@@ -757,8 +750,8 @@ fs_sink_ctf_field_class_variant_borrow_option_by_name(
 	uint64_t i;
 	struct fs_sink_ctf_named_field_class *ret_named_fc = NULL;
 
-	BT_ASSERT(fc);
-	BT_ASSERT(name);
+	BT_ASSERT_DBG(fc);
+	BT_ASSERT_DBG(name);
 
 	for (i = 0; i < fc->options->len; i++) {
 		struct fs_sink_ctf_named_field_class *named_fc =