Communication protocol: use fixed-size integer rather than enum

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/include/lttng/ust-ctl.h b/include/lttng/ust-ctl.h
index 08122a79da002d43fe778812bf9f5b639801a2ad..201782341443d070b2382a8db7f3745873d3e25c 100644 (file)
--- a/include/lttng/ust-ctl.h
+++ b/include/lttng/ust-ctl.h
@@ -309,7 +309,7 @@ struct ustctl_integer_type {
        uint32_t signedness;
        uint32_t reverse_byte_order;
        uint32_t base;          /* 2, 8, 10, 16, for pretty print */
-       enum ustctl_string_encodings encoding;
+       int32_t encoding;       /* enum ustctl_string_encodings */
        uint16_t alignment;     /* in bits */
        char padding[USTCTL_UST_INTEGER_TYPE_PADDING];
 } LTTNG_PACKED;
@@ -346,7 +346,7 @@ union _ustctl_basic_type {
                uint64_t id;    /* enum ID in sessiond. */
        } enumeration;
        struct {
-               enum ustctl_string_encodings encoding;
+               int32_t encoding;       /* enum ustctl_string_encodings */
        } string;
        struct ustctl_float_type _float;
        char padding[USTCTL_UST_BASIC_TYPE_PADDING];

diff --git a/liblttng-ust-comm/lttng-ust-comm.c b/liblttng-ust-comm/lttng-ust-comm.c
index ecc23821fb6fa29624dcbc25564c5011eed4aafb..4e9de57bd0d48e20840b1c168a4e76309f94ad45 100644 (file)
--- a/liblttng-ust-comm/lttng-ust-comm.c
+++ b/liblttng-ust-comm/lttng-ust-comm.c
@@ -766,7 +766,7 @@ ssize_t count_ctx_fields_recursive(size_t nr_fields,
 }
 
 static
-int serialize_string_encoding(enum ustctl_string_encodings *ue,
+int serialize_string_encoding(int32_t *ue,
                enum lttng_string_encodings le)
 {
        switch (le) {