lib: use common precond. assert. macros from `assert-cond.h` thru lib
[babeltrace.git] / src / lib / trace-ir / field-class.c
index e036cfae2e41e69a6e55f538c43a1e5f91d64e3f..5eb08146356534a71b92284ed3ae95f536ef4b77 100644 (file)
@@ -1,33 +1,15 @@
 /*
+ * SPDX-License-Identifier: MIT
+ *
  * Copyright 2017-2018 Philippe Proulx <pproulx@efficios.com>
  * Copyright 2013, 2014 Jérémie Galarneau <jeremie.galarneau@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:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
  */
 
 #define BT_LOG_TAG "LIB/FIELD-CLASS"
 #include "lib/logging.h"
 
-#include "lib/assert-pre.h"
+#include "lib/assert-cond.h"
 #include <babeltrace2/trace-ir/field-class.h>
-#include <babeltrace2/trace-ir/field-class-const.h>
-#include <babeltrace2/trace-ir/field-const.h>
 #include <babeltrace2/trace-ir/field.h>
 #include <babeltrace2/trace-ir/clock-class.h>
 #include "lib/object.h"
@@ -52,7 +34,7 @@
 enum bt_field_class_type bt_field_class_get_type(
                const struct bt_field_class *fc)
 {
-       BT_ASSERT_PRE_DEV_NON_NULL(fc, "Field class");
+       BT_ASSERT_PRE_DEV_FC_NON_NULL(fc);
        return fc->type;
 }
 
@@ -99,7 +81,7 @@ struct bt_field_class *bt_field_class_bit_array_create(
        struct bt_field_class_bit_array *ba_fc = NULL;
 
        BT_ASSERT_PRE_NO_ERROR();
-       BT_ASSERT_PRE_NON_NULL(trace_class, "Trace class");
+       BT_ASSERT_PRE_TC_NON_NULL(trace_class);
        BT_ASSERT_PRE(length > 0 && length <= 64,
                "Unsupported length for bit array field class "
                "(minimum is 1, maximum is 64): length=%" PRIu64, length);
@@ -131,8 +113,8 @@ uint64_t bt_field_class_bit_array_get_length(const struct bt_field_class *fc)
 {
        const struct bt_field_class_bit_array *ba_fc = (const void *) fc;
 
-       BT_ASSERT_PRE_DEV_NON_NULL(fc, "Field class");
-       BT_ASSERT_PRE_DEV_FC_HAS_ID(fc, BT_FIELD_CLASS_TYPE_BIT_ARRAY,
+       BT_ASSERT_PRE_DEV_FC_NON_NULL(fc);
+       BT_ASSERT_PRE_DEV_FC_HAS_TYPE(fc, BT_FIELD_CLASS_TYPE_BIT_ARRAY,
                "Field class");
        return ba_fc->length;
 }
@@ -152,7 +134,7 @@ struct bt_field_class *bt_field_class_bool_create(
        struct bt_field_class_bool *bool_fc = NULL;
 
        BT_ASSERT_PRE_NO_ERROR();
-       BT_ASSERT_PRE_NON_NULL(trace_class, "Trace class");
+       BT_ASSERT_PRE_TC_NON_NULL(trace_class);
        BT_LOGD("Creating default boolean field class object.");
        bool_fc = g_new0(struct bt_field_class_bool, 1);
        if (!bool_fc) {
@@ -210,7 +192,7 @@ struct bt_field_class *create_integer_field_class(bt_trace_class *trace_class,
 {
        struct bt_field_class_integer *int_fc = NULL;
 
-       BT_ASSERT_PRE_NON_NULL(trace_class, "Trace class");
+       BT_ASSERT_PRE_TC_NON_NULL(trace_class);
        BT_LOGD("Creating default integer field class object: type=%s",
                bt_common_field_class_type_string(type));
        int_fc = g_new0(struct bt_field_class_integer, 1);
@@ -258,7 +240,7 @@ uint64_t bt_field_class_integer_get_field_value_range(
 {
        const struct bt_field_class_integer *int_fc = (const void *) fc;
 
-       BT_ASSERT_PRE_DEV_NON_NULL(fc, "Field class");
+       BT_ASSERT_PRE_DEV_FC_NON_NULL(fc);
        BT_ASSERT_PRE_DEV_FC_IS_INT(fc, "Field class");
        return int_fc->range;
 }
@@ -276,12 +258,12 @@ void bt_field_class_integer_set_field_value_range(
 {
        struct bt_field_class_integer *int_fc = (void *) fc;
 
-       BT_ASSERT_PRE_NON_NULL(fc, "Field class");
+       BT_ASSERT_PRE_FC_NON_NULL(fc);
        BT_ASSERT_PRE_FC_IS_INT(fc, "Field class");
        BT_ASSERT_PRE_DEV_FC_HOT(fc, "Field class");
-       BT_ASSERT_PRE(size <= 64,
+       BT_ASSERT_PRE(size >= 1 && size <= 64,
                "Unsupported size for integer field class's field value range "
-               "(maximum is 64): size=%" PRIu64, size);
+               "(minimum is 1, maximum is 64): size=%" PRIu64, size);
        BT_ASSERT_PRE(
                int_fc->common.type == BT_FIELD_CLASS_TYPE_UNSIGNED_INTEGER ||
                int_fc->common.type == BT_FIELD_CLASS_TYPE_SIGNED_INTEGER ||
@@ -298,7 +280,7 @@ bt_field_class_integer_get_preferred_display_base(const struct bt_field_class *f
 {
        const struct bt_field_class_integer *int_fc = (const void *) fc;
 
-       BT_ASSERT_PRE_DEV_NON_NULL(fc, "Field class");
+       BT_ASSERT_PRE_DEV_FC_NON_NULL(fc);
        BT_ASSERT_PRE_DEV_FC_IS_INT(fc, "Field class");
        return int_fc->base;
 }
@@ -309,7 +291,7 @@ void bt_field_class_integer_set_preferred_display_base(
 {
        struct bt_field_class_integer *int_fc = (void *) fc;
 
-       BT_ASSERT_PRE_NON_NULL(fc, "Field class");
+       BT_ASSERT_PRE_FC_NON_NULL(fc);
        BT_ASSERT_PRE_FC_IS_INT(fc, "Field class");
        BT_ASSERT_PRE_DEV_FC_HOT(fc, "Field class");
        int_fc->base = base;
@@ -365,7 +347,7 @@ struct bt_field_class *create_enumeration_field_class(
 {
        struct bt_field_class_enumeration *enum_fc = NULL;
 
-       BT_ASSERT_PRE_NON_NULL(trace_class, "Trace class");
+       BT_ASSERT_PRE_TC_NON_NULL(trace_class);
        BT_LOGD("Creating default enumeration field class object: type=%s",
                bt_common_field_class_type_string(type));
        enum_fc = g_new0(struct bt_field_class_enumeration, 1);
@@ -426,7 +408,7 @@ uint64_t bt_field_class_enumeration_get_mapping_count(
 {
        const struct bt_field_class_enumeration *enum_fc = (const void *) fc;
 
-       BT_ASSERT_PRE_DEV_NON_NULL(fc, "Field class");
+       BT_ASSERT_PRE_DEV_FC_NON_NULL(fc);
        BT_ASSERT_PRE_DEV_FC_IS_ENUM(fc, "Field class");
        return (uint64_t) enum_fc->mappings->len;
 }
@@ -437,9 +419,9 @@ bt_field_class_enumeration_unsigned_borrow_mapping_by_index_const(
 {
        const struct bt_field_class_enumeration *enum_fc = (const void *) fc;
 
-       BT_ASSERT_PRE_DEV_NON_NULL(fc, "Field class");
+       BT_ASSERT_PRE_DEV_FC_NON_NULL(fc);
        BT_ASSERT_PRE_DEV_VALID_INDEX(index, enum_fc->mappings->len);
-       BT_ASSERT_PRE_DEV_FC_HAS_ID(fc, BT_FIELD_CLASS_TYPE_UNSIGNED_ENUMERATION,
+       BT_ASSERT_PRE_DEV_FC_HAS_TYPE(fc, BT_FIELD_CLASS_TYPE_UNSIGNED_ENUMERATION,
                "Field class");
        return (const void *) BT_FIELD_CLASS_ENUM_MAPPING_AT_INDEX(fc, index);
 }
@@ -450,9 +432,9 @@ bt_field_class_enumeration_signed_borrow_mapping_by_index_const(
 {
        const struct bt_field_class_enumeration *enum_fc = (const void *) fc;
 
-       BT_ASSERT_PRE_DEV_NON_NULL(fc, "Field class");
+       BT_ASSERT_PRE_DEV_FC_NON_NULL(fc);
        BT_ASSERT_PRE_DEV_VALID_INDEX(index, enum_fc->mappings->len);
-       BT_ASSERT_PRE_DEV_FC_HAS_ID(fc, BT_FIELD_CLASS_TYPE_SIGNED_ENUMERATION,
+       BT_ASSERT_PRE_DEV_FC_HAS_TYPE(fc, BT_FIELD_CLASS_TYPE_SIGNED_ENUMERATION,
                "Field class");
        return (const void *) BT_FIELD_CLASS_ENUM_MAPPING_AT_INDEX(fc, index);
 }
@@ -486,8 +468,8 @@ const struct bt_field_class_enumeration_signed_mapping *
 bt_field_class_enumeration_signed_borrow_mapping_by_label_const(
                const struct bt_field_class *fc, const char *label)
 {
-       BT_ASSERT_PRE_DEV_NON_NULL(fc, "Field class");
-       BT_ASSERT_PRE_DEV_FC_HAS_ID(fc, BT_FIELD_CLASS_TYPE_SIGNED_ENUMERATION,
+       BT_ASSERT_PRE_DEV_FC_NON_NULL(fc);
+       BT_ASSERT_PRE_DEV_FC_HAS_TYPE(fc, BT_FIELD_CLASS_TYPE_SIGNED_ENUMERATION,
                "Field class");
        return (const void *) borrow_enumeration_field_class_mapping_by_label(
                (const void *) fc, label);
@@ -497,8 +479,8 @@ const struct bt_field_class_enumeration_unsigned_mapping *
 bt_field_class_enumeration_unsigned_borrow_mapping_by_label_const(
                const struct bt_field_class *fc, const char *label)
 {
-       BT_ASSERT_PRE_DEV_NON_NULL(fc, "Field class");
-       BT_ASSERT_PRE_DEV_FC_HAS_ID(fc,
+       BT_ASSERT_PRE_DEV_FC_NON_NULL(fc);
+       BT_ASSERT_PRE_DEV_FC_HAS_TYPE(fc,
                BT_FIELD_CLASS_TYPE_UNSIGNED_ENUMERATION, "Field class");
        return (const void *) borrow_enumeration_field_class_mapping_by_label(
                (const void *) fc, label);
@@ -543,10 +525,10 @@ bt_field_class_enumeration_unsigned_get_mapping_labels_for_value(
        uint64_t i;
 
        BT_ASSERT_PRE_DEV_NO_ERROR();
-       BT_ASSERT_PRE_DEV_NON_NULL(fc, "Field class");
+       BT_ASSERT_PRE_DEV_FC_NON_NULL(fc);
        BT_ASSERT_PRE_DEV_NON_NULL(label_array, "Label array (output)");
        BT_ASSERT_PRE_DEV_NON_NULL(count, "Count (output)");
-       BT_ASSERT_PRE_DEV_FC_HAS_ID(fc, BT_FIELD_CLASS_TYPE_UNSIGNED_ENUMERATION,
+       BT_ASSERT_PRE_DEV_FC_HAS_TYPE(fc, BT_FIELD_CLASS_TYPE_UNSIGNED_ENUMERATION,
                "Field class");
        g_ptr_array_set_size(enum_fc->label_buf, 0);
 
@@ -584,10 +566,10 @@ bt_field_class_enumeration_signed_get_mapping_labels_for_value(
        uint64_t i;
 
        BT_ASSERT_PRE_DEV_NO_ERROR();
-       BT_ASSERT_PRE_DEV_NON_NULL(fc, "Field class");
+       BT_ASSERT_PRE_DEV_FC_NON_NULL(fc);
        BT_ASSERT_PRE_DEV_NON_NULL(label_array, "Label array (output)");
        BT_ASSERT_PRE_DEV_NON_NULL(count, "Count (output)");
-       BT_ASSERT_PRE_DEV_FC_HAS_ID(fc, BT_FIELD_CLASS_TYPE_SIGNED_ENUMERATION,
+       BT_ASSERT_PRE_DEV_FC_HAS_TYPE(fc, BT_FIELD_CLASS_TYPE_SIGNED_ENUMERATION,
                "Field class");
        g_ptr_array_set_size(enum_fc->label_buf, 0);
 
@@ -653,7 +635,7 @@ add_mapping_to_enumeration_field_class(struct bt_field_class *fc,
        BT_ASSERT_PRE_NO_ERROR();
        BT_ASSERT(fc);
        BT_ASSERT_PRE_NON_NULL(label, "Label");
-       BT_ASSERT_PRE_NON_NULL(range_set, "Integer range set");
+       BT_ASSERT_PRE_INT_RANGE_SET_NON_NULL(range_set);
        BT_ASSERT_PRE(!enumeration_field_class_has_mapping_with_label(
                enum_fc, label),
                "Duplicate mapping name in enumeration field class: "
@@ -681,8 +663,8 @@ bt_field_class_enumeration_unsigned_add_mapping(
                const struct bt_integer_range_set_unsigned *range_set)
 {
        BT_ASSERT_PRE_NO_ERROR();
-       BT_ASSERT_PRE_NON_NULL(fc, "Field class");
-       BT_ASSERT_PRE_FC_HAS_ID(fc, BT_FIELD_CLASS_TYPE_UNSIGNED_ENUMERATION,
+       BT_ASSERT_PRE_FC_NON_NULL(fc);
+       BT_ASSERT_PRE_FC_HAS_TYPE(fc, BT_FIELD_CLASS_TYPE_UNSIGNED_ENUMERATION,
                "Field class");
        return add_mapping_to_enumeration_field_class(fc, label,
                (const void *) range_set);
@@ -694,8 +676,8 @@ bt_field_class_enumeration_signed_add_mapping(
                const struct bt_integer_range_set_signed *range_set)
 {
        BT_ASSERT_PRE_NO_ERROR();
-       BT_ASSERT_PRE_NON_NULL(fc, "Field class");
-       BT_ASSERT_PRE_FC_HAS_ID(fc, BT_FIELD_CLASS_TYPE_SIGNED_ENUMERATION,
+       BT_ASSERT_PRE_FC_NON_NULL(fc);
+       BT_ASSERT_PRE_FC_HAS_TYPE(fc, BT_FIELD_CLASS_TYPE_SIGNED_ENUMERATION,
                "Field class");
        return add_mapping_to_enumeration_field_class(fc, label,
                (const void *) range_set);
@@ -716,7 +698,7 @@ struct bt_field_class *create_real_field_class(bt_trace_class *trace_class,
 {
        struct bt_field_class_real *real_fc = NULL;
 
-       BT_ASSERT_PRE_NON_NULL(trace_class, "Trace class");
+       BT_ASSERT_PRE_TC_NON_NULL(trace_class);
        BT_LOGD("Creating default real field class object: type=%s",
                bt_common_field_class_type_string(type));
        real_fc = g_new0(struct bt_field_class_real, 1);
@@ -867,7 +849,7 @@ struct bt_field_class *bt_field_class_structure_create(
        struct bt_field_class_structure *struct_fc = NULL;
 
        BT_ASSERT_PRE_NO_ERROR();
-       BT_ASSERT_PRE_NON_NULL(trace_class, "Trace class");
+       BT_ASSERT_PRE_TC_NON_NULL(trace_class);
        BT_LOGD_STR("Creating default structure field class object.");
        struct_fc = g_new0(struct bt_field_class_structure, 1);
        if (!struct_fc) {
@@ -1022,8 +1004,8 @@ bt_field_class_structure_append_member(
        struct bt_named_field_class *named_fc = NULL;
 
        BT_ASSERT_PRE_NO_ERROR();
-       BT_ASSERT_PRE_NON_NULL(fc, "Field class");
-       BT_ASSERT_PRE_FC_HAS_ID(fc, BT_FIELD_CLASS_TYPE_STRUCTURE,
+       BT_ASSERT_PRE_FC_NON_NULL(fc);
+       BT_ASSERT_PRE_FC_HAS_TYPE(fc, BT_FIELD_CLASS_TYPE_STRUCTURE,
                "Field class");
        named_fc = create_named_field_class(name, member_fc);
        if (!named_fc) {
@@ -1048,8 +1030,8 @@ uint64_t bt_field_class_structure_get_member_count(
 {
        struct bt_field_class_structure *struct_fc = (void *) fc;
 
-       BT_ASSERT_PRE_DEV_NON_NULL(fc, "Field class");
-       BT_ASSERT_PRE_DEV_FC_HAS_ID(fc, BT_FIELD_CLASS_TYPE_STRUCTURE,
+       BT_ASSERT_PRE_DEV_FC_NON_NULL(fc);
+       BT_ASSERT_PRE_DEV_FC_HAS_TYPE(fc, BT_FIELD_CLASS_TYPE_STRUCTURE,
                "Field class");
        return (uint64_t) struct_fc->common.named_fcs->len;
 }
@@ -1069,8 +1051,8 @@ const struct bt_field_class_structure_member *
 bt_field_class_structure_borrow_member_by_index_const(
                const struct bt_field_class *fc, uint64_t index)
 {
-       BT_ASSERT_PRE_DEV_NON_NULL(fc, "Field class");
-       BT_ASSERT_PRE_DEV_FC_HAS_ID(fc, BT_FIELD_CLASS_TYPE_STRUCTURE,
+       BT_ASSERT_PRE_DEV_FC_NON_NULL(fc);
+       BT_ASSERT_PRE_DEV_FC_HAS_TYPE(fc, BT_FIELD_CLASS_TYPE_STRUCTURE,
                "Field class");
        return (const void *)
                borrow_named_field_class_from_container_field_class_at_index(
@@ -1081,8 +1063,8 @@ struct bt_field_class_structure_member *
 bt_field_class_structure_borrow_member_by_index(
                struct bt_field_class *fc, uint64_t index)
 {
-       BT_ASSERT_PRE_DEV_NON_NULL(fc, "Field class");
-       BT_ASSERT_PRE_DEV_FC_HAS_ID(fc, BT_FIELD_CLASS_TYPE_STRUCTURE,
+       BT_ASSERT_PRE_DEV_FC_NON_NULL(fc);
+       BT_ASSERT_PRE_DEV_FC_HAS_TYPE(fc, BT_FIELD_CLASS_TYPE_STRUCTURE,
                "Field class");
        return (void *)
                borrow_named_field_class_from_container_field_class_at_index(
@@ -1100,7 +1082,7 @@ borrow_named_field_class_from_container_field_class_by_name(
        gpointer value;
 
        BT_ASSERT_DBG(fc);
-       BT_ASSERT_PRE_DEV_NON_NULL(name, "Name");
+       BT_ASSERT_PRE_DEV_NAME_NON_NULL(name);
        if (!g_hash_table_lookup_extended(fc->name_to_index, name, &orig_key,
                        &value)) {
                goto end;
@@ -1116,8 +1098,8 @@ const struct bt_field_class_structure_member *
 bt_field_class_structure_borrow_member_by_name_const(
                const struct bt_field_class *fc, const char *name)
 {
-       BT_ASSERT_PRE_DEV_NON_NULL(fc, "Field class");
-       BT_ASSERT_PRE_DEV_FC_HAS_ID(fc, BT_FIELD_CLASS_TYPE_STRUCTURE,
+       BT_ASSERT_PRE_DEV_FC_NON_NULL(fc);
+       BT_ASSERT_PRE_DEV_FC_HAS_TYPE(fc, BT_FIELD_CLASS_TYPE_STRUCTURE,
                "Field class");
        return (const void *)
                borrow_named_field_class_from_container_field_class_by_name(
@@ -1128,8 +1110,8 @@ struct bt_field_class_structure_member *
 bt_field_class_structure_borrow_member_by_name(
                struct bt_field_class *fc, const char *name)
 {
-       BT_ASSERT_PRE_DEV_NON_NULL(fc, "Field class");
-       BT_ASSERT_PRE_DEV_FC_HAS_ID(fc, BT_FIELD_CLASS_TYPE_STRUCTURE,
+       BT_ASSERT_PRE_DEV_FC_NON_NULL(fc);
+       BT_ASSERT_PRE_DEV_FC_HAS_TYPE(fc, BT_FIELD_CLASS_TYPE_STRUCTURE,
                "Field class");
        return (void *)
                borrow_named_field_class_from_container_field_class_by_name(
@@ -1141,7 +1123,7 @@ const char *bt_field_class_structure_member_get_name(
 {
        const struct bt_named_field_class *named_fc = (const void *) member;
 
-       BT_ASSERT_PRE_DEV_NON_NULL(member, "Structure field class member");
+       BT_ASSERT_PRE_DEV_STRUCT_FC_MEMBER_NON_NULL(member);
        return named_fc->name->str;
 }
 
@@ -1151,7 +1133,7 @@ bt_field_class_structure_member_borrow_field_class_const(
 {
        const struct bt_named_field_class *named_fc = (const void *) member;
 
-       BT_ASSERT_PRE_DEV_NON_NULL(member, "Structure field class member");
+       BT_ASSERT_PRE_DEV_STRUCT_FC_MEMBER_NON_NULL(member);
        return named_fc->fc;
 }
 
@@ -1161,7 +1143,7 @@ bt_field_class_structure_member_borrow_field_class(
 {
        struct bt_named_field_class *named_fc = (void *) member;
 
-       BT_ASSERT_PRE_DEV_NON_NULL(member, "Structure field class member");
+       BT_ASSERT_PRE_DEV_STRUCT_FC_MEMBER_NON_NULL(member);
        return named_fc->fc;
 }
 
@@ -1206,7 +1188,7 @@ struct bt_field_class *create_option_field_class(
 {
        struct bt_field_class_option *opt_fc = NULL;
 
-       BT_ASSERT_PRE_NON_NULL(trace_class, "Trace class");
+       BT_ASSERT_PRE_TC_NON_NULL(trace_class);
        BT_ASSERT_PRE_NON_NULL(content_fc, "Content field class");
        BT_LIB_LOGD("Creating option field class: "
                "type=%s, %![content-fc-]+F, %![sel-fc-]+F",
@@ -1219,7 +1201,7 @@ struct bt_field_class *create_option_field_class(
                BT_ASSERT_PRE_NON_NULL(selector_fc, "Selector field class");
 
                if (fc_type == BT_FIELD_CLASS_TYPE_OPTION_WITH_BOOL_SELECTOR_FIELD) {
-                       BT_ASSERT_PRE_FC_HAS_ID(selector_fc,
+                       BT_ASSERT_PRE_FC_HAS_TYPE(selector_fc,
                                BT_FIELD_CLASS_TYPE_BOOL,
                                "Selector field class");
                        opt_with_sel_fc = (void *) g_new0(
@@ -1310,7 +1292,7 @@ bt_field_class_option_with_selector_field_integer_unsigned_create(
                (const void *) u_range_set;
 
        BT_ASSERT_PRE_NO_ERROR();
-       BT_ASSERT_PRE_NON_NULL(range_set, "Integer range set");
+       BT_ASSERT_PRE_INT_RANGE_SET_NON_NULL(range_set);
        BT_ASSERT_PRE(range_set->ranges->len > 0,
                "Integer range set is empty: %!+R", range_set);
        fc = (void *) create_option_field_class(trace_class,
@@ -1341,7 +1323,7 @@ bt_field_class_option_with_selector_field_integer_signed_create(
                (const void *) i_range_set;
 
        BT_ASSERT_PRE_NO_ERROR();
-       BT_ASSERT_PRE_NON_NULL(range_set, "Integer range set");
+       BT_ASSERT_PRE_INT_RANGE_SET_NON_NULL(range_set);
        BT_ASSERT_PRE(range_set->ranges->len > 0,
                "Integer range set is empty: %!+R", range_set);
        fc = (void *) create_option_field_class(trace_class,
@@ -1365,7 +1347,7 @@ const struct bt_field_class *bt_field_class_option_borrow_field_class_const(
 {
        struct bt_field_class_option *opt_fc = (void *) fc;
 
-       BT_ASSERT_PRE_NON_NULL(fc, "Field class");
+       BT_ASSERT_PRE_FC_NON_NULL(fc);
        BT_ASSERT_PRE_FC_IS_OPTION(fc, "Field class");
        return opt_fc->content_fc;
 }
@@ -1375,7 +1357,7 @@ struct bt_field_class *bt_field_class_option_borrow_field_class(
 {
        struct bt_field_class_option *opt_fc = (void *) fc;
 
-       BT_ASSERT_PRE_NON_NULL(fc, "Field class");
+       BT_ASSERT_PRE_FC_NON_NULL(fc);
        BT_ASSERT_PRE_FC_IS_OPTION(fc, "Field class");
        return opt_fc->content_fc;
 }
@@ -1387,7 +1369,7 @@ bt_field_class_option_with_selector_field_borrow_selector_field_path_const(
        const struct bt_field_class_option_with_selector_field *opt_fc =
                (const void *) fc;
 
-       BT_ASSERT_PRE_NON_NULL(fc, "Field class");
+       BT_ASSERT_PRE_FC_NON_NULL(fc);
        BT_ASSERT_PRE_FC_IS_OPTION_WITH_SEL(fc, "Field class");
        return opt_fc->selector_field_path;
 }
@@ -1397,8 +1379,8 @@ void bt_field_class_option_with_selector_field_bool_set_selector_is_reversed(
 {
        struct bt_field_class_option_with_selector_field_bool *opt_fc = (void *) fc;
 
-       BT_ASSERT_PRE_NON_NULL(fc, "Field class");
-       BT_ASSERT_PRE_FC_HAS_ID(fc,
+       BT_ASSERT_PRE_FC_NON_NULL(fc);
+       BT_ASSERT_PRE_FC_HAS_TYPE(fc,
                BT_FIELD_CLASS_TYPE_OPTION_WITH_BOOL_SELECTOR_FIELD, "Field class");
        BT_ASSERT_PRE_DEV_FC_HOT(fc, "Field class");
        opt_fc->sel_is_reversed = sel_is_reversed;
@@ -1409,8 +1391,8 @@ bt_bool bt_field_class_option_with_selector_field_bool_selector_is_reversed(
 {
        struct bt_field_class_option_with_selector_field_bool *opt_fc = (void *) fc;
 
-       BT_ASSERT_PRE_NON_NULL(fc, "Field class");
-       BT_ASSERT_PRE_FC_HAS_ID(fc,
+       BT_ASSERT_PRE_FC_NON_NULL(fc);
+       BT_ASSERT_PRE_FC_HAS_TYPE(fc,
                BT_FIELD_CLASS_TYPE_OPTION_WITH_BOOL_SELECTOR_FIELD, "Field class");
        return opt_fc->sel_is_reversed;
 }
@@ -1422,7 +1404,7 @@ bt_field_class_option_with_selector_field_integer_unsigned_borrow_selector_range
        struct bt_field_class_option_with_selector_field_integer *opt_fc =
                (void *) fc;
 
-       BT_ASSERT_PRE_NON_NULL(fc, "Field class");
+       BT_ASSERT_PRE_FC_NON_NULL(fc);
        BT_ASSERT_PRE_FC_IS_OPTION_WITH_INT_SEL(fc, "Field class");
        return (const void *) opt_fc->range_set;
 }
@@ -1434,7 +1416,7 @@ bt_field_class_option_with_selector_field_integer_signed_borrow_selector_ranges_
        struct bt_field_class_option_with_selector_field_integer *opt_fc =
                (void *) fc;
 
-       BT_ASSERT_PRE_NON_NULL(fc, "Field class");
+       BT_ASSERT_PRE_FC_NON_NULL(fc);
        BT_ASSERT_PRE_FC_IS_OPTION_WITH_INT_SEL(fc, "Field class");
        return (const void *) opt_fc->range_set;
 }
@@ -1481,7 +1463,7 @@ struct bt_field_class *bt_field_class_variant_create(
        enum bt_field_class_type fc_type;
 
        BT_ASSERT_PRE_NO_ERROR();
-       BT_ASSERT_PRE_NON_NULL(trace_class, "Trace class");
+       BT_ASSERT_PRE_TC_NON_NULL(trace_class);
 
        if (selector_fc) {
                BT_ASSERT_PRE_FC_IS_INT(selector_fc, "Selector field class");
@@ -1559,10 +1541,10 @@ bt_field_class_variant_without_selector_append_option(struct bt_field_class *fc,
        struct bt_named_field_class *named_fc = NULL;
 
        BT_ASSERT_PRE_NO_ERROR();
-       BT_ASSERT_PRE_NON_NULL(fc, "Field class");
-       BT_ASSERT_PRE_NON_NULL(name, "Name");
+       BT_ASSERT_PRE_FC_NON_NULL(fc);
+       BT_ASSERT_PRE_NAME_NON_NULL(name);
        BT_ASSERT_PRE_NON_NULL(option_fc, "Option field class");
-       BT_ASSERT_PRE_FC_HAS_ID(fc,
+       BT_ASSERT_PRE_FC_HAS_TYPE(fc,
                BT_FIELD_CLASS_TYPE_VARIANT_WITHOUT_SELECTOR_FIELD, "Field class");
        named_fc = create_named_field_class(name, option_fc);
        if (!named_fc) {
@@ -1683,11 +1665,11 @@ int append_option_to_variant_with_selector_field_field_class(
        struct bt_field_class_variant_with_selector_field_option *opt = NULL;
        bool has_overlap;
 
-       BT_ASSERT_PRE_NON_NULL(fc, "Field class");
-       BT_ASSERT_PRE_NON_NULL(name, "Name");
+       BT_ASSERT_PRE_FC_NON_NULL(fc);
+       BT_ASSERT_PRE_NAME_NON_NULL(name);
        BT_ASSERT_PRE_NON_NULL(option_fc, "Option field class");
-       BT_ASSERT_PRE_NON_NULL(range_set, "Integer range set");
-       BT_ASSERT_PRE_FC_HAS_ID(fc, expected_type, "Field class");
+       BT_ASSERT_PRE_INT_RANGE_SET_NON_NULL(range_set);
+       BT_ASSERT_PRE_FC_HAS_TYPE(fc, expected_type, "Field class");
        BT_ASSERT_PRE(range_set->ranges->len > 0,
                "Integer range set is empty: %!+R", range_set);
        status = ranges_overlap(var_fc->common.common.named_fcs, range_set,
@@ -1753,7 +1735,7 @@ uint64_t bt_field_class_variant_get_option_count(const struct bt_field_class *fc
 {
        const struct bt_field_class_variant *var_fc = (const void *) fc;
 
-       BT_ASSERT_PRE_DEV_NON_NULL(fc, "Field class");
+       BT_ASSERT_PRE_DEV_FC_NON_NULL(fc);
        BT_ASSERT_PRE_DEV_FC_IS_VARIANT(fc, "Field class");
        return (uint64_t) var_fc->common.named_fcs->len;
 }
@@ -1762,7 +1744,7 @@ const struct bt_field_class_variant_option *
 bt_field_class_variant_borrow_option_by_name_const(
                const struct bt_field_class *fc, const char *name)
 {
-       BT_ASSERT_PRE_DEV_NON_NULL(fc, "Field class");
+       BT_ASSERT_PRE_DEV_FC_NON_NULL(fc);
        BT_ASSERT_PRE_DEV_FC_IS_VARIANT(fc, "Field class");
        return (const void *)
                borrow_named_field_class_from_container_field_class_by_name(
@@ -1773,7 +1755,7 @@ const struct bt_field_class_variant_option *
 bt_field_class_variant_borrow_option_by_index_const(
                const struct bt_field_class *fc, uint64_t index)
 {
-       BT_ASSERT_PRE_DEV_NON_NULL(fc, "Field class");
+       BT_ASSERT_PRE_DEV_FC_NON_NULL(fc);
        BT_ASSERT_PRE_DEV_FC_IS_VARIANT(fc, "Field class");
        return (const void *)
                borrow_named_field_class_from_container_field_class_at_index(
@@ -1784,7 +1766,7 @@ struct bt_field_class_variant_option *
 bt_field_class_variant_borrow_option_by_name(
                struct bt_field_class *fc, const char *name)
 {
-       BT_ASSERT_PRE_DEV_NON_NULL(fc, "Field class");
+       BT_ASSERT_PRE_DEV_FC_NON_NULL(fc);
        BT_ASSERT_PRE_DEV_FC_IS_VARIANT(fc, "Field class");
        return (void *)
                borrow_named_field_class_from_container_field_class_by_name(
@@ -1795,7 +1777,7 @@ struct bt_field_class_variant_option *
 bt_field_class_variant_borrow_option_by_index(
                struct bt_field_class *fc, uint64_t index)
 {
-       BT_ASSERT_PRE_DEV_NON_NULL(fc, "Field class");
+       BT_ASSERT_PRE_DEV_FC_NON_NULL(fc);
        BT_ASSERT_PRE_DEV_FC_IS_VARIANT(fc, "Field class");
        return (void *)
                borrow_named_field_class_from_container_field_class_at_index(
@@ -1806,8 +1788,8 @@ const struct bt_field_class_variant_with_selector_field_integer_unsigned_option
 bt_field_class_variant_with_selector_field_integer_unsigned_borrow_option_by_name_const(
                const struct bt_field_class *fc, const char *name)
 {
-       BT_ASSERT_PRE_DEV_NON_NULL(fc, "Field class");
-       BT_ASSERT_PRE_DEV_FC_HAS_ID(fc,
+       BT_ASSERT_PRE_DEV_FC_NON_NULL(fc);
+       BT_ASSERT_PRE_DEV_FC_HAS_TYPE(fc,
                BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_INTEGER_SELECTOR_FIELD,
                "Field class");
        return (const void *)
@@ -1819,8 +1801,8 @@ const struct bt_field_class_variant_with_selector_field_integer_unsigned_option
 bt_field_class_variant_with_selector_field_integer_unsigned_borrow_option_by_index_const(
                const struct bt_field_class *fc, uint64_t index)
 {
-       BT_ASSERT_PRE_DEV_NON_NULL(fc, "Field class");
-       BT_ASSERT_PRE_DEV_FC_HAS_ID(fc,
+       BT_ASSERT_PRE_DEV_FC_NON_NULL(fc);
+       BT_ASSERT_PRE_DEV_FC_HAS_TYPE(fc,
                BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_INTEGER_SELECTOR_FIELD,
                "Field class");
        return (const void *)
@@ -1832,8 +1814,8 @@ const struct bt_field_class_variant_with_selector_field_integer_signed_option *
 bt_field_class_variant_with_selector_field_integer_signed_borrow_option_by_name_const(
                const struct bt_field_class *fc, const char *name)
 {
-       BT_ASSERT_PRE_DEV_NON_NULL(fc, "Field class");
-       BT_ASSERT_PRE_DEV_FC_HAS_ID(fc,
+       BT_ASSERT_PRE_DEV_FC_NON_NULL(fc);
+       BT_ASSERT_PRE_DEV_FC_HAS_TYPE(fc,
                BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_INTEGER_SELECTOR_FIELD,
                "Field class");
        return (const void *)
@@ -1845,8 +1827,8 @@ const struct bt_field_class_variant_with_selector_field_integer_signed_option *
 bt_field_class_variant_with_selector_field_integer_signed_borrow_option_by_index_const(
                const struct bt_field_class *fc, uint64_t index)
 {
-       BT_ASSERT_PRE_DEV_NON_NULL(fc, "Field class");
-       BT_ASSERT_PRE_DEV_FC_HAS_ID(fc,
+       BT_ASSERT_PRE_DEV_FC_NON_NULL(fc);
+       BT_ASSERT_PRE_DEV_FC_HAS_TYPE(fc,
                BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_INTEGER_SELECTOR_FIELD,
                "Field class");
        return (const void *)
@@ -1859,7 +1841,7 @@ const char *bt_field_class_variant_option_get_name(
 {
        const struct bt_named_field_class *named_fc = (const void *) option;
 
-       BT_ASSERT_PRE_DEV_NON_NULL(option, "Variant field class option");
+       BT_ASSERT_PRE_DEV_VAR_FC_OPT_NON_NULL(option);
        return named_fc->name->str;
 }
 
@@ -1869,7 +1851,7 @@ bt_field_class_variant_option_borrow_field_class_const(
 {
        const struct bt_named_field_class *named_fc = (const void *) option;
 
-       BT_ASSERT_PRE_DEV_NON_NULL(option, "Variant field class option");
+       BT_ASSERT_PRE_DEV_VAR_FC_OPT_NON_NULL(option);
        return named_fc->fc;
 }
 
@@ -1879,7 +1861,7 @@ bt_field_class_variant_option_borrow_field_class(
 {
        struct bt_named_field_class *named_fc = (void *) option;
 
-       BT_ASSERT_PRE_DEV_NON_NULL(option, "Variant field class option");
+       BT_ASSERT_PRE_DEV_VAR_FC_OPT_NON_NULL(option);
        return named_fc->fc;
 }
 
@@ -1890,7 +1872,7 @@ bt_field_class_variant_with_selector_field_integer_unsigned_option_borrow_ranges
        const struct bt_field_class_variant_with_selector_field_option *opt =
                (const void *) option;
 
-       BT_ASSERT_PRE_DEV_NON_NULL(option, "Variant field class option");
+       BT_ASSERT_PRE_DEV_VAR_FC_OPT_NON_NULL(option);
        return (const void *) opt->range_set;
 }
 
@@ -1901,7 +1883,7 @@ bt_field_class_variant_with_selector_field_integer_signed_option_borrow_ranges_c
        const struct bt_field_class_variant_with_selector_field_option *opt =
                (const void *) option;
 
-       BT_ASSERT_PRE_DEV_NON_NULL(option, "Variant field class option");
+       BT_ASSERT_PRE_DEV_VAR_FC_OPT_NON_NULL(option);
        return (const void *) opt->range_set;
 }
 
@@ -1912,7 +1894,7 @@ bt_field_class_variant_with_selector_field_borrow_selector_field_path_const(
        const struct bt_field_class_variant_with_selector_field *var_fc =
                (const void *) fc;
 
-       BT_ASSERT_PRE_DEV_NON_NULL(fc, "Field class");
+       BT_ASSERT_PRE_DEV_FC_NON_NULL(fc);
        BT_ASSERT_PRE_DEV_FC_IS_VARIANT_WITH_SEL(fc, "Field class");
        return var_fc->selector_field_path;
 }
@@ -1963,7 +1945,7 @@ bt_field_class_array_static_create(bt_trace_class *trace_class,
        struct bt_field_class_array_static *array_fc = NULL;
 
        BT_ASSERT_PRE_NO_ERROR();
-       BT_ASSERT_PRE_NON_NULL(trace_class, "Trace class");
+       BT_ASSERT_PRE_TC_NON_NULL(trace_class);
        BT_ASSERT_PRE_NON_NULL(element_fc, "Element field class");
        BT_LOGD_STR("Creating default static array field class object.");
        array_fc = g_new0(struct bt_field_class_array_static, 1);
@@ -1996,7 +1978,7 @@ bt_field_class_array_borrow_element_field_class_const(
 {
        const struct bt_field_class_array *array_fc = (const void *) fc;
 
-       BT_ASSERT_PRE_DEV_NON_NULL(fc, "Field class");
+       BT_ASSERT_PRE_DEV_FC_NON_NULL(fc);
        BT_ASSERT_PRE_DEV_FC_IS_ARRAY(fc, "Field class");
        return array_fc->element_fc;
 }
@@ -2006,7 +1988,7 @@ bt_field_class_array_borrow_element_field_class(struct bt_field_class *fc)
 {
        struct bt_field_class_array *array_fc = (void *) fc;
 
-       BT_ASSERT_PRE_DEV_NON_NULL(fc, "Field class");
+       BT_ASSERT_PRE_DEV_FC_NON_NULL(fc);
        BT_ASSERT_PRE_DEV_FC_IS_ARRAY(fc, "Field class");
        return array_fc->element_fc;
 }
@@ -2015,8 +1997,8 @@ uint64_t bt_field_class_array_static_get_length(const struct bt_field_class *fc)
 {
        const struct bt_field_class_array_static *array_fc = (const void *) fc;
 
-       BT_ASSERT_PRE_DEV_NON_NULL(fc, "Field class");
-       BT_ASSERT_PRE_DEV_FC_HAS_ID(fc, BT_FIELD_CLASS_TYPE_STATIC_ARRAY,
+       BT_ASSERT_PRE_DEV_FC_NON_NULL(fc);
+       BT_ASSERT_PRE_DEV_FC_HAS_TYPE(fc, BT_FIELD_CLASS_TYPE_STATIC_ARRAY,
                "Field class");
        return (uint64_t) array_fc->length;
 }
@@ -2044,7 +2026,7 @@ struct bt_field_class *bt_field_class_array_dynamic_create(
        struct bt_field_class_array_dynamic *array_fc = NULL;
 
        BT_ASSERT_PRE_NO_ERROR();
-       BT_ASSERT_PRE_NON_NULL(trace_class, "Trace class");
+       BT_ASSERT_PRE_TC_NON_NULL(trace_class);
        BT_ASSERT_PRE_NON_NULL(element_fc, "Element field class");
        BT_LOGD_STR("Creating default dynamic array field class object.");
        array_fc = g_new0(struct bt_field_class_array_dynamic, 1);
@@ -2087,8 +2069,8 @@ bt_field_class_array_dynamic_with_length_field_borrow_length_field_path_const(
        const struct bt_field_class_array_dynamic *seq_fc = (const void *) fc;
 
        BT_ASSERT_PRE_NO_ERROR();
-       BT_ASSERT_PRE_DEV_NON_NULL(fc, "Field class");
-       BT_ASSERT_PRE_DEV_FC_HAS_ID(fc,
+       BT_ASSERT_PRE_DEV_FC_NON_NULL(fc);
+       BT_ASSERT_PRE_DEV_FC_HAS_TYPE(fc,
                BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY_WITH_LENGTH_FIELD,
                "Field class");
        return seq_fc->length_field_path;
@@ -2108,7 +2090,7 @@ struct bt_field_class *bt_field_class_string_create(bt_trace_class *trace_class)
        struct bt_field_class_string *string_fc = NULL;
 
        BT_ASSERT_PRE_NO_ERROR();
-       BT_ASSERT_PRE_NON_NULL(trace_class, "Trace class");
+       BT_ASSERT_PRE_TC_NON_NULL(trace_class);
        BT_LOGD_STR("Creating default string field class object.");
        string_fc = g_new0(struct bt_field_class_string, 1);
        if (!string_fc) {
@@ -2204,7 +2186,7 @@ void bt_field_class_make_part_of_trace_class(const struct bt_field_class *c_fc)
 const struct bt_value *bt_field_class_borrow_user_attributes_const(
                const struct bt_field_class *fc)
 {
-       BT_ASSERT_PRE_DEV_NON_NULL(fc, "Field class");
+       BT_ASSERT_PRE_DEV_FC_NON_NULL(fc);
        return fc->user_attributes;
 }
 
@@ -2220,8 +2202,8 @@ void bt_field_class_set_user_attributes(
                struct bt_field_class *fc,
                const struct bt_value *user_attributes)
 {
-       BT_ASSERT_PRE_NON_NULL(fc, "Field class");
-       BT_ASSERT_PRE_NON_NULL(user_attributes, "User attributes");
+       BT_ASSERT_PRE_FC_NON_NULL(fc);
+       BT_ASSERT_PRE_USER_ATTRS_NON_NULL(user_attributes);
        BT_ASSERT_PRE(user_attributes->type == BT_VALUE_TYPE_MAP,
                "User attributes object is not a map value object.");
        BT_ASSERT_PRE_DEV_FC_HOT(fc, "Field class");
@@ -2242,9 +2224,8 @@ void bt_named_field_class_set_user_attributes(
                struct bt_named_field_class *named_fc,
                const struct bt_value *user_attributes)
 {
-       BT_ASSERT_PRE_NON_NULL(user_attributes, "User attributes");
-       BT_ASSERT_PRE(user_attributes->type == BT_VALUE_TYPE_MAP,
-               "User attributes object is not a map value object.");
+       BT_ASSERT_PRE_USER_ATTRS_NON_NULL(user_attributes);
+       BT_ASSERT_PRE_USER_ATTRS_IS_MAP(user_attributes);
        BT_ASSERT_PRE_DEV_HOT(named_fc,
                "Structure field class member or variant field class option",
                ".");
@@ -2257,7 +2238,7 @@ const struct bt_value *
 bt_field_class_structure_member_borrow_user_attributes_const(
                const struct bt_field_class_structure_member *member)
 {
-       BT_ASSERT_PRE_NON_NULL(member, "Structure field class member");
+       BT_ASSERT_PRE_STRUCT_FC_MEMBER_NON_NULL(member);
        return bt_named_field_class_borrow_user_attributes_const(
                (const void *) member);
 }
@@ -2266,7 +2247,7 @@ struct bt_value *
 bt_field_class_structure_member_borrow_user_attributes(
                struct bt_field_class_structure_member *member)
 {
-       BT_ASSERT_PRE_NON_NULL(member, "Structure field class member");
+       BT_ASSERT_PRE_STRUCT_FC_MEMBER_NON_NULL(member);
        return (void *) bt_named_field_class_borrow_user_attributes_const(
                (void *) member);
 }
@@ -2275,7 +2256,7 @@ void bt_field_class_structure_member_set_user_attributes(
                struct bt_field_class_structure_member *member,
                const struct bt_value *user_attributes)
 {
-       BT_ASSERT_PRE_NON_NULL(member, "Structure field class member");
+       BT_ASSERT_PRE_STRUCT_FC_MEMBER_NON_NULL(member);
        bt_named_field_class_set_user_attributes((void *) member,
                user_attributes);
 }
@@ -2283,7 +2264,7 @@ void bt_field_class_structure_member_set_user_attributes(
 const struct bt_value *bt_field_class_variant_option_borrow_user_attributes_const(
                const struct bt_field_class_variant_option *option)
 {
-       BT_ASSERT_PRE_NON_NULL(option, "Variant field class option");
+       BT_ASSERT_PRE_VAR_FC_OPT_NON_NULL(option);
        return bt_named_field_class_borrow_user_attributes_const(
                (const void *) option);
 }
@@ -2291,7 +2272,7 @@ const struct bt_value *bt_field_class_variant_option_borrow_user_attributes_cons
 struct bt_value *bt_field_class_variant_option_borrow_user_attributes(
                struct bt_field_class_variant_option *option)
 {
-       BT_ASSERT_PRE_NON_NULL(option, "Variant field class option");
+       BT_ASSERT_PRE_VAR_FC_OPT_NON_NULL(option);
        return (void *) bt_named_field_class_borrow_user_attributes_const(
                (void *) option);
 }
@@ -2300,7 +2281,7 @@ void bt_field_class_variant_option_set_user_attributes(
                struct bt_field_class_variant_option *option,
                const struct bt_value *user_attributes)
 {
-       BT_ASSERT_PRE_NON_NULL(option, "Variant field class option");
+       BT_ASSERT_PRE_VAR_FC_OPT_NON_NULL(option);
        bt_named_field_class_set_user_attributes((void *) option,
                user_attributes);
 }
This page took 0.043206 seconds and 4 git commands to generate.