X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=liblttng-ust-comm%2Flttng-ust-comm.c;h=f9398e0d9891311ef2cdb3837905a4a67944c9ca;hb=cf22367fec17f2b2650e637de84fc2f614e4d2ac;hp=d7991f19b6098b97f1333f013e332df426c3bf0d;hpb=e1904921db97b70d94e69f0ab3264c6f7fe62f32;p=deliverable%2Flttng-ust.git

diff --git a/liblttng-ust-comm/lttng-ust-comm.c b/liblttng-ust-comm/lttng-ust-comm.c
index d7991f19..f9398e0d 100644
--- a/liblttng-ust-comm/lttng-ust-comm.c
+++ b/liblttng-ust-comm/lttng-ust-comm.c
@@ -779,7 +779,7 @@ ssize_t count_one_type(const struct lttng_type *lt)
 		return 1;
 	case atype_struct:
 		return count_fields_recursive(lt->u.legacy._struct.nr_fields,
-				lt->u.legacy._struct.fields);
+				lt->u.legacy._struct.fields) + 1;
 	case atype_enum_nestable:
 		return count_one_type(lt->u.enum_nestable.container_type) + 1;
 	case atype_array_nestable:
@@ -788,7 +788,7 @@ ssize_t count_one_type(const struct lttng_type *lt)
 		return count_one_type(lt->u.sequence_nestable.elem_type) + 1;
 	case atype_struct_nestable:
 		return count_fields_recursive(lt->u.struct_nestable.nr_fields,
-				lt->u.struct_nestable.fields);
+				lt->u.struct_nestable.fields) + 1;
 
 	case atype_dynamic:
 	{
@@ -801,10 +801,10 @@ ssize_t count_one_type(const struct lttng_type *lt)
 		if (ret)
 			return ret;
 		/*
-		 * One field for enum, one field for variant, and
+		 * Two fields for enum, one field for variant, and
 		 * one field per choice.
 		 */
-		return count_fields_recursive(nr_choices, choices) + 2;
+		return count_fields_recursive(nr_choices, choices) + 3;
 	}
 
 	default: