X-Git-Url: https://git.efficios.com/?a=blobdiff_plain;f=src%2Flib%2Flib-logging.c;h=562b7ce463a2413ca9a3e17d0dc157684a00b7b8;hb=b8ddb4f036272e30030202637201d11baf5f20a5;hp=af30bd2f82c0817b43bf03f1b22bb325df65fc3e;hpb=76276a81e72d967979674fdc0a646b42d8d6033e;p=babeltrace.git

diff --git a/src/lib/lib-logging.c b/src/lib/lib-logging.c
index af30bd2f..562b7ce4 100644
--- a/src/lib/lib-logging.c
+++ b/src/lib/lib-logging.c
@@ -239,7 +239,8 @@ static inline void format_field_class(char **buf_ch, bool extended,
 		BUF_APPEND(", %slength=%" PRIu64, PRFIELD(array_fc->length));
 		break;
 	}
-	case BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY:
+	case BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY_WITHOUT_LENGTH_FIELD:
+	case BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY_WITH_LENGTH_FIELD:
 	{
 		const struct bt_field_class_array_dynamic *array_fc =
 			(const void *) field_class;
@@ -260,7 +261,10 @@ static inline void format_field_class(char **buf_ch, bool extended,
 
 		break;
 	}
-	case BT_FIELD_CLASS_TYPE_OPTION:
+	case BT_FIELD_CLASS_TYPE_OPTION_WITHOUT_SELECTOR:
+	case BT_FIELD_CLASS_TYPE_OPTION_WITH_BOOL_SELECTOR:
+	case BT_FIELD_CLASS_TYPE_OPTION_WITH_UNSIGNED_INTEGER_SELECTOR:
+	case BT_FIELD_CLASS_TYPE_OPTION_WITH_SIGNED_INTEGER_SELECTOR:
 	{
 		const struct bt_field_class_option *opt_fc =
 			(const void *) field_class;
@@ -269,23 +273,29 @@ static inline void format_field_class(char **buf_ch, bool extended,
 			PRFIELD(opt_fc->content_fc),
 			PRFIELD(bt_common_field_class_type_string(opt_fc->content_fc->type)));
 
-		if (opt_fc->selector_fc) {
-			SET_TMP_PREFIX("selector-fc-");
-			format_field_class(buf_ch, extended, tmp_prefix,
-				opt_fc->selector_fc);
-		}
+		if (field_class->type !=
+				BT_FIELD_CLASS_TYPE_OPTION_WITHOUT_SELECTOR) {
+			const struct bt_field_class_option_with_selector *opt_with_sel_fc =
+				(const void *) field_class;
 
-		if (opt_fc->selector_field_path) {
-			SET_TMP_PREFIX("selector-field-path-");
-			format_field_path(buf_ch, extended, tmp_prefix,
-				opt_fc->selector_field_path);
+			if (opt_with_sel_fc->selector_fc) {
+				SET_TMP_PREFIX("selector-fc-");
+				format_field_class(buf_ch, extended, tmp_prefix,
+					opt_with_sel_fc->selector_fc);
+			}
+
+			if (opt_with_sel_fc->selector_field_path) {
+				SET_TMP_PREFIX("selector-field-path-");
+				format_field_path(buf_ch, extended, tmp_prefix,
+					opt_with_sel_fc->selector_field_path);
+			}
 		}
 
 		break;
 	}
 	case BT_FIELD_CLASS_TYPE_VARIANT_WITHOUT_SELECTOR:
-	case BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_SELECTOR:
-	case BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_SELECTOR:
+	case BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_INTEGER_SELECTOR:
+	case BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_INTEGER_SELECTOR:
 	{
 		const struct bt_field_class_variant *var_fc =
 			(const void *) field_class;
@@ -295,8 +305,8 @@ static inline void format_field_class(char **buf_ch, bool extended,
 				PRFIELD(var_fc->common.named_fcs->len));
 		}
 
-		if (field_class->type == BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_SELECTOR ||
-				field_class->type == BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_SELECTOR) {
+		if (field_class->type == BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_INTEGER_SELECTOR ||
+				field_class->type == BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_INTEGER_SELECTOR) {
 			const struct bt_field_class_variant_with_selector *var_with_sel_fc =
 				(const void *) var_fc;
 
@@ -419,7 +429,8 @@ static inline void format_field(char **buf_ch, bool extended,
 		break;
 	}
 	case BT_FIELD_CLASS_TYPE_STATIC_ARRAY:
-	case BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY:
+	case BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY_WITHOUT_LENGTH_FIELD:
+	case BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY_WITH_LENGTH_FIELD:
 	{
 		const struct bt_field_array *array_field = (const void *) field;
 
@@ -433,8 +444,8 @@ static inline void format_field(char **buf_ch, bool extended,
 		break;
 	}
 	case BT_FIELD_CLASS_TYPE_VARIANT_WITHOUT_SELECTOR:
-	case BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_SELECTOR:
-	case BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_SELECTOR:
+	case BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_INTEGER_SELECTOR:
+	case BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_INTEGER_SELECTOR:
 	{
 		const struct bt_field_variant *var_field = (const void *) field;