X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Flib%2Ftrace-ir%2Fresolve-field-path.c;h=59fc0164f53bdc656b37816de67a9c0eb59e11d6;hb=bdb288b3e94e412a33c8647d44f6cfac66ca0665;hp=ed44e059e7dcba5c5284d79557770e22bcafbc1b;hpb=185ecf645233ced089ad72b060a420e8f6f7edeb;p=babeltrace.git

diff --git a/src/lib/trace-ir/resolve-field-path.c b/src/lib/trace-ir/resolve-field-path.c
index ed44e059..59fc0164 100644
--- a/src/lib/trace-ir/resolve-field-path.c
+++ b/src/lib/trace-ir/resolve-field-path.c
@@ -166,7 +166,7 @@ end:
 	return field_path;
 }
 
-BT_ASSERT_PRE_FUNC
+BT_ASSERT_PRE_DEV_FUNC
 static inline
 bool target_is_before_source(struct bt_field_path *src_field_path,
 		struct bt_field_path *tgt_field_path)
@@ -210,7 +210,7 @@ end:
 	return is_valid;
 }
 
-BT_ASSERT_PRE_FUNC
+BT_ASSERT_PRE_DEV_FUNC
 static inline
 struct bt_field_class *borrow_root_field_class(
 		struct bt_resolve_field_path_context *ctx, enum bt_scope scope)
@@ -231,7 +231,7 @@ struct bt_field_class *borrow_root_field_class(
 	return NULL;
 }
 
-BT_ASSERT_PRE_FUNC
+BT_ASSERT_PRE_DEV_FUNC
 static inline
 struct bt_field_class *borrow_child_field_class(
 		struct bt_field_class *parent_fc,
@@ -268,7 +268,7 @@ struct bt_field_class *borrow_child_field_class(
 	return child_fc;
 }
 
-BT_ASSERT_PRE_FUNC
+BT_ASSERT_PRE_DEV_FUNC
 static inline
 bool target_field_path_in_different_scope_has_struct_fc_only(
 		struct bt_field_path *src_field_path,
@@ -305,7 +305,7 @@ end:
 	return is_valid;
 }
 
-BT_ASSERT_PRE_FUNC
+BT_ASSERT_PRE_DEV_FUNC
 static inline
 bool lca_is_structure_field_class(struct bt_field_path *src_field_path,
 		struct bt_field_path *tgt_field_path,
@@ -361,7 +361,7 @@ end:
 	return is_valid;
 }
 
-BT_ASSERT_PRE_FUNC
+BT_ASSERT_PRE_DEV_FUNC
 static inline
 bool lca_to_target_has_struct_fc_only(struct bt_field_path *src_field_path,
 		struct bt_field_path *tgt_field_path,
@@ -421,7 +421,7 @@ end:
 	return is_valid;
 }
 
-BT_ASSERT_PRE_FUNC
+BT_ASSERT_PRE_DEV_FUNC
 static inline
 bool field_path_is_valid(struct bt_field_class *src_fc,
 		struct bt_field_class *tgt_fc,
@@ -434,14 +434,14 @@ bool field_path_is_valid(struct bt_field_class *src_fc,
 		tgt_fc, ctx);
 
 	if (!src_field_path) {
-		BT_ASSERT_PRE_MSG("Cannot find requesting field class in "
+		BT_ASSERT_PRE_DEV_MSG("Cannot find requesting field class in "
 			"resolving context: %!+F", src_fc);
 		is_valid = false;
 		goto end;
 	}
 
 	if (!tgt_field_path) {
-		BT_ASSERT_PRE_MSG("Cannot find target field class in "
+		BT_ASSERT_PRE_DEV_MSG("Cannot find target field class in "
 			"resolving context: %!+F", tgt_fc);
 		is_valid = false;
 		goto end;
@@ -449,7 +449,7 @@ bool field_path_is_valid(struct bt_field_class *src_fc,
 
 	/* Target must be before source */
 	if (!target_is_before_source(src_field_path, tgt_field_path)) {
-		BT_ASSERT_PRE_MSG("Target field class is located after "
+		BT_ASSERT_PRE_DEV_MSG("Target field class is located after "
 			"requesting field class: %![req-fc-]+F, %![tgt-fc-]+F",
 			src_fc, tgt_fc);
 		is_valid = false;
@@ -462,7 +462,7 @@ bool field_path_is_valid(struct bt_field_class *src_fc,
 	 */
 	if (!target_field_path_in_different_scope_has_struct_fc_only(
 			src_field_path, tgt_field_path, ctx)) {
-		BT_ASSERT_PRE_MSG("Target field class is located in a "
+		BT_ASSERT_PRE_DEV_MSG("Target field class is located in a "
 			"different scope than requesting field class, "
 			"but within an array or a variant field class: "
 			"%![req-fc-]+F, %![tgt-fc-]+F",
@@ -473,7 +473,7 @@ bool field_path_is_valid(struct bt_field_class *src_fc,
 
 	/* Same scope: LCA must be a structure field class */
 	if (!lca_is_structure_field_class(src_field_path, tgt_field_path, ctx)) {
-		BT_ASSERT_PRE_MSG("Lowest common ancestor of target and "
+		BT_ASSERT_PRE_DEV_MSG("Lowest common ancestor of target and "
 			"requesting field classes is not a structure field class: "
 			"%![req-fc-]+F, %![tgt-fc-]+F",
 			src_fc, tgt_fc);
@@ -484,7 +484,7 @@ bool field_path_is_valid(struct bt_field_class *src_fc,
 	/* Same scope: path from LCA to target has no array/variant FTs */
 	if (!lca_to_target_has_struct_fc_only(src_field_path, tgt_field_path,
 			ctx)) {
-		BT_ASSERT_PRE_MSG("Path from lowest common ancestor of target "
+		BT_ASSERT_PRE_DEV_MSG("Path from lowest common ancestor of target "
 			"and requesting field classes to target field class "
 			"contains an array or a variant field class: "
 			"%![req-fc-]+F, %![tgt-fc-]+F", src_fc, tgt_fc);
@@ -503,7 +503,7 @@ struct bt_field_path *resolve_field_path(struct bt_field_class *src_fc,
 		struct bt_field_class *tgt_fc,
 		struct bt_resolve_field_path_context *ctx)
 {
-	BT_ASSERT_PRE(field_path_is_valid(src_fc, tgt_fc, ctx),
+	BT_ASSERT_PRE_DEV(field_path_is_valid(src_fc, tgt_fc, ctx),
 		"Invalid target field class: %![req-fc-]+F, %![tgt-fc-]+F",
 		src_fc, tgt_fc);
 	return find_field_class_in_ctx(tgt_fc, ctx);