X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=src%2Flib%2Ftrace-ir%2Fresolve-field-path.c;h=4b08bbe8f5a191a4e3b31367be7be6e45a3daa09;hb=ebdb6693c51a79b4d323f4b69ee4e1c75f48e58e;hp=adf4c139f1e4fdd018bb998c3d6389b58dc1f339;hpb=9c3869a9d005111c48715720e4c9a100cb2d5ec7;p=babeltrace.git

diff --git a/src/lib/trace-ir/resolve-field-path.c b/src/lib/trace-ir/resolve-field-path.c
index adf4c139..4b08bbe8 100644
--- a/src/lib/trace-ir/resolve-field-path.c
+++ b/src/lib/trace-ir/resolve-field-path.c
@@ -46,12 +46,7 @@ bool find_field_class_recursive(struct bt_field_class *fc,
 		goto end;
 	}
 
-	switch (fc->type) {
-	case BT_FIELD_CLASS_TYPE_OPTION_WITHOUT_SELECTOR_FIELD:
-	case BT_FIELD_CLASS_TYPE_OPTION_WITH_BOOL_SELECTOR_FIELD:
-	case BT_FIELD_CLASS_TYPE_OPTION_WITH_UNSIGNED_INTEGER_SELECTOR_FIELD:
-	case BT_FIELD_CLASS_TYPE_OPTION_WITH_SIGNED_INTEGER_SELECTOR_FIELD:
-	{
+	if (bt_field_class_type_is(fc->type, BT_FIELD_CLASS_TYPE_OPTION)) {
 		struct bt_field_class_option *opt_fc = (void *) fc;
 		struct bt_field_path_item item = {
 			.type = BT_FIELD_PATH_ITEM_TYPE_CURRENT_OPTION_CONTENT,
@@ -66,13 +61,9 @@ bool find_field_class_recursive(struct bt_field_class *fc,
 		}
 
 		bt_field_path_remove_last_item(field_path);
-		break;
-	}
-	case BT_FIELD_CLASS_TYPE_STRUCTURE:
-	case BT_FIELD_CLASS_TYPE_VARIANT_WITHOUT_SELECTOR_FIELD:
-	case BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_INTEGER_SELECTOR_FIELD:
-	case BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_INTEGER_SELECTOR_FIELD:
-	{
+	} else if (fc->type == BT_FIELD_CLASS_TYPE_STRUCTURE ||
+			bt_field_class_type_is(fc->type,
+				BT_FIELD_CLASS_TYPE_VARIANT)) {
 		struct bt_field_class_named_field_class_container *container_fc =
 			(void *) fc;
 		uint64_t i;
@@ -94,13 +85,7 @@ bool find_field_class_recursive(struct bt_field_class *fc,
 
 			bt_field_path_remove_last_item(field_path);
 		}
-
-		break;
-	}
-	case BT_FIELD_CLASS_TYPE_STATIC_ARRAY:
-	case BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY_WITHOUT_LENGTH_FIELD:
-	case BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY_WITH_LENGTH_FIELD:
-	{
+	} else if (bt_field_class_type_is(fc->type, BT_FIELD_CLASS_TYPE_ARRAY)) {
 		struct bt_field_class_array *array_fc = (void *) fc;
 		struct bt_field_path_item item = {
 			.type = BT_FIELD_PATH_ITEM_TYPE_CURRENT_ARRAY_ELEMENT,
@@ -115,10 +100,6 @@ bool find_field_class_recursive(struct bt_field_class *fc,
 		}
 
 		bt_field_path_remove_last_item(field_path);
-		break;
-	}
-	default:
-		break;
 	}
 
 end:
@@ -262,24 +243,16 @@ struct bt_field_class *borrow_child_field_class(
 {
 	struct bt_field_class *child_fc = NULL;
 
-	switch (parent_fc->type) {
-	case BT_FIELD_CLASS_TYPE_OPTION_WITHOUT_SELECTOR_FIELD:
-	case BT_FIELD_CLASS_TYPE_OPTION_WITH_BOOL_SELECTOR_FIELD:
-	case BT_FIELD_CLASS_TYPE_OPTION_WITH_UNSIGNED_INTEGER_SELECTOR_FIELD:
-	case BT_FIELD_CLASS_TYPE_OPTION_WITH_SIGNED_INTEGER_SELECTOR_FIELD:
-	{
+	if (bt_field_class_type_is(parent_fc->type,
+			BT_FIELD_CLASS_TYPE_OPTION)) {
 		struct bt_field_class_option *opt_fc = (void *) parent_fc;
 
 		BT_ASSERT(fp_item->type ==
 			BT_FIELD_PATH_ITEM_TYPE_CURRENT_OPTION_CONTENT);
 		child_fc = opt_fc->content_fc;
-		break;
-	}
-	case BT_FIELD_CLASS_TYPE_STRUCTURE:
-	case BT_FIELD_CLASS_TYPE_VARIANT_WITHOUT_SELECTOR_FIELD:
-	case BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_INTEGER_SELECTOR_FIELD:
-	case BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_INTEGER_SELECTOR_FIELD:
-	{
+	} else if (parent_fc->type == BT_FIELD_CLASS_TYPE_STRUCTURE ||
+			bt_field_class_type_is(parent_fc->type,
+				BT_FIELD_CLASS_TYPE_VARIANT)) {
 		struct bt_field_class_named_field_class_container *container_fc =
 			(void *) parent_fc;
 		struct bt_named_field_class *named_fc;
@@ -287,21 +260,13 @@ struct bt_field_class *borrow_child_field_class(
 		BT_ASSERT(fp_item->type == BT_FIELD_PATH_ITEM_TYPE_INDEX);
 		named_fc = container_fc->named_fcs->pdata[fp_item->index];
 		child_fc = named_fc->fc;
-		break;
-	}
-	case BT_FIELD_CLASS_TYPE_STATIC_ARRAY:
-	case BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY_WITHOUT_LENGTH_FIELD:
-	case BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY_WITH_LENGTH_FIELD:
-	{
+	} else if (bt_field_class_type_is(parent_fc->type,
+			BT_FIELD_CLASS_TYPE_ARRAY)) {
 		struct bt_field_class_array *array_fc = (void *) parent_fc;
 
 		BT_ASSERT(fp_item->type ==
 			BT_FIELD_PATH_ITEM_TYPE_CURRENT_ARRAY_ELEMENT);
 		child_fc = array_fc->element_fc;
-		break;
-	}
-	default:
-		break;
 	}
 
 	return child_fc;
@@ -329,16 +294,12 @@ bool target_field_path_in_different_scope_has_struct_fc_only(
 			bt_field_path_borrow_item_by_index_inline(
 				tgt_field_path, i);
 
-		if (fc->type == BT_FIELD_CLASS_TYPE_STATIC_ARRAY ||
-				fc->type == BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY_WITHOUT_LENGTH_FIELD ||
-				fc->type == BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY_WITH_LENGTH_FIELD ||
-				fc->type == BT_FIELD_CLASS_TYPE_OPTION_WITHOUT_SELECTOR_FIELD ||
-				fc->type == BT_FIELD_CLASS_TYPE_OPTION_WITH_BOOL_SELECTOR_FIELD ||
-				fc->type == BT_FIELD_CLASS_TYPE_OPTION_WITH_UNSIGNED_INTEGER_SELECTOR_FIELD ||
-				fc->type == BT_FIELD_CLASS_TYPE_OPTION_WITH_SIGNED_INTEGER_SELECTOR_FIELD ||
-				fc->type == BT_FIELD_CLASS_TYPE_VARIANT_WITHOUT_SELECTOR_FIELD ||
-				fc->type == BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_INTEGER_SELECTOR_FIELD ||
-				fc->type == BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_INTEGER_SELECTOR_FIELD) {
+		if (bt_field_class_type_is(fc->type,
+				BT_FIELD_CLASS_TYPE_ARRAY) ||
+				bt_field_class_type_is(fc->type,
+					BT_FIELD_CLASS_TYPE_OPTION) ||
+				bt_field_class_type_is(fc->type,
+					BT_FIELD_CLASS_TYPE_VARIANT)) {
 			is_valid = false;
 			goto end;
 		}
@@ -453,16 +414,12 @@ bool lca_to_target_has_struct_fc_only(struct bt_field_path *src_field_path,
 			bt_field_path_borrow_item_by_index_inline(
 				tgt_field_path, tgt_i);
 
-		if (tgt_fc->type == BT_FIELD_CLASS_TYPE_STATIC_ARRAY ||
-				tgt_fc->type == BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY_WITHOUT_LENGTH_FIELD ||
-				tgt_fc->type == BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY_WITH_LENGTH_FIELD ||
-				tgt_fc->type == BT_FIELD_CLASS_TYPE_OPTION_WITHOUT_SELECTOR_FIELD ||
-				tgt_fc->type == BT_FIELD_CLASS_TYPE_OPTION_WITH_BOOL_SELECTOR_FIELD ||
-				tgt_fc->type == BT_FIELD_CLASS_TYPE_OPTION_WITH_UNSIGNED_INTEGER_SELECTOR_FIELD ||
-				tgt_fc->type == BT_FIELD_CLASS_TYPE_OPTION_WITH_SIGNED_INTEGER_SELECTOR_FIELD ||
-				tgt_fc->type == BT_FIELD_CLASS_TYPE_VARIANT_WITHOUT_SELECTOR_FIELD ||
-				tgt_fc->type == BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_INTEGER_SELECTOR_FIELD ||
-				tgt_fc->type == BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_INTEGER_SELECTOR_FIELD) {
+		if (bt_field_class_type_is(tgt_fc->type,
+				BT_FIELD_CLASS_TYPE_ARRAY) ||
+				bt_field_class_type_is(tgt_fc->type,
+					BT_FIELD_CLASS_TYPE_OPTION) ||
+				bt_field_class_type_is(tgt_fc->type,
+					BT_FIELD_CLASS_TYPE_VARIANT)) {
 			is_valid = false;
 			goto end;
 		}
@@ -571,11 +528,8 @@ int bt_resolve_field_paths(struct bt_field_class *fc,
 	BT_ASSERT(fc);
 
 	/* Resolving part for dynamic array and variant field classes */
-	switch (fc->type) {
-	case BT_FIELD_CLASS_TYPE_OPTION_WITH_BOOL_SELECTOR_FIELD:
-	case BT_FIELD_CLASS_TYPE_OPTION_WITH_UNSIGNED_INTEGER_SELECTOR_FIELD:
-	case BT_FIELD_CLASS_TYPE_OPTION_WITH_SIGNED_INTEGER_SELECTOR_FIELD:
-	{
+	if (bt_field_class_type_is(fc->type,
+			BT_FIELD_CLASS_TYPE_OPTION_WITH_SELECTOR_FIELD)) {
 		struct bt_field_class_option_with_selector_field *opt_fc = (void *) fc;
 
 		BT_ASSERT(opt_fc->selector_fc);
@@ -586,11 +540,7 @@ int bt_resolve_field_paths(struct bt_field_class *fc,
 			ret = -1;
 			goto end;
 		}
-
-		break;
-	}
-	case BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY_WITH_LENGTH_FIELD:
-	{
+	} else if (fc->type == BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY_WITH_LENGTH_FIELD) {
 		struct bt_field_class_array_dynamic *dyn_array_fc = (void *) fc;
 
 		BT_ASSERT(dyn_array_fc->length_fc);
@@ -601,12 +551,8 @@ int bt_resolve_field_paths(struct bt_field_class *fc,
 			ret = -1;
 			goto end;
 		}
-
-		break;
-	}
-	case BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_INTEGER_SELECTOR_FIELD:
-	case BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_INTEGER_SELECTOR_FIELD:
-	{
+	} else if (bt_field_class_type_is(fc->type,
+			BT_FIELD_CLASS_TYPE_VARIANT_WITH_SELECTOR_FIELD)) {
 		struct bt_field_class_variant_with_selector_field *var_fc =
 			(void *) fc;
 
@@ -621,27 +567,15 @@ int bt_resolve_field_paths(struct bt_field_class *fc,
 			}
 		}
 	}
-	default:
-		break;
-	}
 
 	/* Recursive part */
-	switch (fc->type) {
-	case BT_FIELD_CLASS_TYPE_OPTION_WITHOUT_SELECTOR_FIELD:
-	case BT_FIELD_CLASS_TYPE_OPTION_WITH_BOOL_SELECTOR_FIELD:
-	case BT_FIELD_CLASS_TYPE_OPTION_WITH_UNSIGNED_INTEGER_SELECTOR_FIELD:
-	case BT_FIELD_CLASS_TYPE_OPTION_WITH_SIGNED_INTEGER_SELECTOR_FIELD:
-	{
+	if (bt_field_class_type_is(fc->type, BT_FIELD_CLASS_TYPE_OPTION)) {
 		struct bt_field_class_option *opt_fc = (void *) fc;
 
 		ret = bt_resolve_field_paths(opt_fc->content_fc, ctx);
-		break;
-	}
-	case BT_FIELD_CLASS_TYPE_STRUCTURE:
-	case BT_FIELD_CLASS_TYPE_VARIANT_WITHOUT_SELECTOR_FIELD:
-	case BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_INTEGER_SELECTOR_FIELD:
-	case BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_INTEGER_SELECTOR_FIELD:
-	{
+	} else if (fc->type == BT_FIELD_CLASS_TYPE_STRUCTURE ||
+			bt_field_class_type_is(fc->type,
+				BT_FIELD_CLASS_TYPE_VARIANT)) {
 		struct bt_field_class_named_field_class_container *container_fc =
 			(void *) fc;
 		uint64_t i;
@@ -655,20 +589,11 @@ int bt_resolve_field_paths(struct bt_field_class *fc,
 				goto end;
 			}
 		}
-
-		break;
-	}
-	case BT_FIELD_CLASS_TYPE_STATIC_ARRAY:
-	case BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY_WITHOUT_LENGTH_FIELD:
-	case BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY_WITH_LENGTH_FIELD:
-	{
+	} else if (bt_field_class_type_is(fc->type,
+			BT_FIELD_CLASS_TYPE_ARRAY)) {
 		struct bt_field_class_array *array_fc = (void *) fc;
 
 		ret = bt_resolve_field_paths(array_fc->element_fc, ctx);
-		break;
-	}
-	default:
-		break;
 	}
 
 end: