X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=lib%2Ftrace-ir%2Fresolve-field-path.c;h=00ec6447b49fd9f00e75ac814a21bb44a6271180;hb=35fa110e5bea4a35497313adf3e3d0fa09db9ff7;hp=fc4727bf6af5018d52b6ebf8aa6cd73b8f866509;hpb=78cf9df64fd5fe1ac99335a0957adad5ef231fdf;p=babeltrace.git

diff --git a/lib/trace-ir/resolve-field-path.c b/lib/trace-ir/resolve-field-path.c
index fc4727bf..00ec6447 100644
--- a/lib/trace-ir/resolve-field-path.c
+++ b/lib/trace-ir/resolve-field-path.c
@@ -25,8 +25,7 @@
 
 #include <babeltrace/assert-pre-internal.h>
 #include <babeltrace/assert-internal.h>
-#include <babeltrace/object.h>
-#include <babeltrace/trace-ir/field-classes-internal.h>
+#include <babeltrace/trace-ir/field-class-internal.h>
 #include <babeltrace/trace-ir/field-path-internal.h>
 #include <babeltrace/trace-ir/field-path-const.h>
 #include <babeltrace/trace-ir/resolve-field-path-internal.h>
@@ -336,8 +335,8 @@ bool lca_is_structure_field_class(struct bt_field_path *src_field_path,
 			if (!prev_fc) {
 				/*
 				 * This is correct: the LCA is the root
-				 * scope field classe, which must be a
-				 * structure field classe.
+				 * scope field class, which must be a
+				 * structure field class.
 				 */
 				break;
 			}
@@ -452,14 +451,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 classe in "
+		BT_ASSERT_PRE_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 classe in "
+		BT_ASSERT_PRE_MSG("Cannot find target field class in "
 			"resolving context: %!+F", tgt_fc);
 		is_valid = false;
 		goto end;
@@ -467,8 +466,8 @@ 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 classe is located after "
-			"requesting field classe: %![req-fc-]+F, %![tgt-fc-]+F",
+		BT_ASSERT_PRE_MSG("Target field class is located after "
+			"requesting field class: %![req-fc-]+F, %![tgt-fc-]+F",
 			src_fc, tgt_fc);
 		is_valid = false;
 		goto end;
@@ -480,19 +479,19 @@ 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 classe is located in a "
-			"different scope than requesting field classe, "
-			"but within an array or a variant field classe: "
+		BT_ASSERT_PRE_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",
 			src_fc, tgt_fc);
 		is_valid = false;
 		goto end;
 	}
 
-	/* Same scope: LCA must be a structure field classe */
+	/* 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 "
-			"requesting field classes is not a structure field classe: "
+			"requesting field classes is not a structure field class: "
 			"%![req-fc-]+F, %![tgt-fc-]+F",
 			src_fc, tgt_fc);
 		is_valid = false;
@@ -503,8 +502,8 @@ bool field_path_is_valid(struct bt_field_class *src_fc,
 	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 "
-			"and requesting field classes to target field classe "
-			"contains an array or a variant field classe: "
+			"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);
 		is_valid = false;
 		goto end;
@@ -522,7 +521,7 @@ struct bt_field_path *resolve_field_path(struct bt_field_class *src_fc,
 		struct bt_resolve_field_path_context *ctx)
 {
 	BT_ASSERT_PRE(field_path_is_valid(src_fc, tgt_fc, ctx),
-		"Invalid target field classe: %![req-fc-]+F, %![tgt-fc-]+F",
+		"Invalid target field class: %![req-fc-]+F, %![tgt-fc-]+F",
 		src_fc, tgt_fc);
 	return find_field_class_in_ctx(tgt_fc, ctx);
 }