X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fevent-field-value.c;h=b57c7c53e206fc249de919575583e04234aef923;hp=b571f6246430ad7ba667b9d24c15a519fc7b7d31;hb=9918e00a8a03011c145bb45c35b183c94ec69023;hpb=44635d77b591f83a80d48cd93497bd1cd6aa788d

diff --git a/src/common/event-field-value.c b/src/common/event-field-value.c
index b571f6246..b57c7c53e 100644
--- a/src/common/event-field-value.c
+++ b/src/common/event-field-value.c
@@ -387,13 +387,19 @@ lttng_event_field_value_unsigned_int_get_value(
 				parent)->val;
 		break;
 	case LTTNG_EVENT_FIELD_VALUE_TYPE_UNSIGNED_ENUM:
-		*val = container_of(
-				container_of(field_val,
-					const struct lttng_event_field_value_enum,
-					parent),
-				const struct lttng_event_field_value_enum_uint,
-				parent)->val;
+	{
+		const struct lttng_event_field_value_enum *field_val_enum = container_of(
+				field_val,
+				const struct lttng_event_field_value_enum,
+				parent);
+		const struct lttng_event_field_value_enum_uint
+				*field_val_enum_uint = container_of(
+						field_val_enum,
+						const struct lttng_event_field_value_enum_uint,
+						parent);
+		*val = field_val_enum_uint->val;
 		break;
+	}
 	default:
 		status = LTTNG_EVENT_FIELD_VALUE_STATUS_INVALID;
 		goto end;
@@ -423,13 +429,19 @@ lttng_event_field_value_signed_int_get_value(
 				parent)->val;
 		break;
 	case LTTNG_EVENT_FIELD_VALUE_TYPE_SIGNED_ENUM:
-		*val = container_of(
-				container_of(field_val,
-					const struct lttng_event_field_value_enum,
-					parent),
-				const struct lttng_event_field_value_enum_int,
-				parent)->val;
+	{
+		const struct lttng_event_field_value_enum *field_val_enum = container_of(
+				field_val,
+				const struct lttng_event_field_value_enum,
+				parent);
+		const struct lttng_event_field_value_enum_int
+				*field_val_enum_uint = container_of(
+						field_val_enum,
+						const struct lttng_event_field_value_enum_int,
+						parent);
+		*val = field_val_enum_uint->val;
 		break;
+	}
 	default:
 		status = LTTNG_EVENT_FIELD_VALUE_STATUS_INVALID;
 		goto end;