X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Flib%2Ftrace-ir%2Ffield.h;h=e56f0d2fc348775cf35f44e7bc17a713b4c2504e;hb=43c59509042845f8d42c3e99ec74d45fa2dc0908;hp=2352baadbf33f36a0f31b96e9ad63d7adca79173;hpb=81b8fa4490092c27f40470f1f50a925f768b7b83;p=babeltrace.git

diff --git a/src/lib/trace-ir/field.h b/src/lib/trace-ir/field.h
index 2352baad..e56f0d2f 100644
--- a/src/lib/trace-ir/field.h
+++ b/src/lib/trace-ir/field.h
@@ -73,17 +73,17 @@
 
 #define BT_ASSERT_PRE_DEV_FIELD_IS_OPTION(_field, _name)		\
 	BT_ASSERT_PRE_DEV(						\
-		((const struct bt_field *) (_field))->class->type == BT_FIELD_CLASS_TYPE_OPTION_WITHOUT_SELECTOR || \
-		((const struct bt_field *) (_field))->class->type == BT_FIELD_CLASS_TYPE_OPTION_WITH_BOOL_SELECTOR || \
-		((const struct bt_field *) (_field))->class->type == BT_FIELD_CLASS_TYPE_OPTION_WITH_UNSIGNED_INTEGER_SELECTOR || \
-		((const struct bt_field *) (_field))->class->type == BT_FIELD_CLASS_TYPE_OPTION_WITH_SIGNED_INTEGER_SELECTOR, \
+		((const struct bt_field *) (_field))->class->type == BT_FIELD_CLASS_TYPE_OPTION_WITHOUT_SELECTOR_FIELD || \
+		((const struct bt_field *) (_field))->class->type == BT_FIELD_CLASS_TYPE_OPTION_WITH_BOOL_SELECTOR_FIELD || \
+		((const struct bt_field *) (_field))->class->type == BT_FIELD_CLASS_TYPE_OPTION_WITH_UNSIGNED_INTEGER_SELECTOR_FIELD || \
+		((const struct bt_field *) (_field))->class->type == BT_FIELD_CLASS_TYPE_OPTION_WITH_SIGNED_INTEGER_SELECTOR_FIELD, \
 		_name " is not an option field: %![field-]+f", (_field))
 
 #define BT_ASSERT_PRE_DEV_FIELD_IS_VARIANT(_field, _name)		\
 	BT_ASSERT_PRE_DEV(						\
-		((const struct bt_field *) (_field))->class->type == BT_FIELD_CLASS_TYPE_VARIANT_WITHOUT_SELECTOR || \
-		((const struct bt_field *) (_field))->class->type == BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_INTEGER_SELECTOR || \
-		((const struct bt_field *) (_field))->class->type == BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_INTEGER_SELECTOR, \
+		((const struct bt_field *) (_field))->class->type == BT_FIELD_CLASS_TYPE_VARIANT_WITHOUT_SELECTOR_FIELD || \
+		((const struct bt_field *) (_field))->class->type == BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_INTEGER_SELECTOR_FIELD || \
+		((const struct bt_field *) (_field))->class->type == BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_INTEGER_SELECTOR_FIELD, \
 		_name " is not a variant field: %![field-]+f", (_field))
 
 #define BT_ASSERT_PRE_DEV_FIELD_IS_SET(_field, _name)			\
@@ -208,15 +208,15 @@ void _bt_field_set_is_frozen(const struct bt_field *field, bool is_frozen);
 static inline
 void _bt_field_reset(const struct bt_field *field)
 {
-	BT_ASSERT(field);
-	BT_ASSERT(field->methods->reset);
+	BT_ASSERT_DBG(field);
+	BT_ASSERT_DBG(field->methods->reset);
 	field->methods->reset((void *) field);
 }
 
 static inline
 void _bt_field_set_single(struct bt_field *field, bool value)
 {
-	BT_ASSERT(field);
+	BT_ASSERT_DBG(field);
 	field->is_set = value;
 }
 
@@ -229,7 +229,7 @@ bt_bool _bt_field_is_set(const struct bt_field *field)
 		goto end;
 	}
 
-	BT_ASSERT(field->methods->is_set);
+	BT_ASSERT_DBG(field->methods->is_set);
 	is_set = field->methods->is_set(field);
 
 end: