From 1a37a8730e943967540944344da2f8bd1702d78e Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Wed, 17 Mar 2021 16:13:54 -0400 Subject: [PATCH] Namespace enumeration structures/enum with lttng_ust_ prefix Signed-off-by: Mathieu Desnoyers Change-Id: Icefbecc56d6425d2e6a3adebc592babf70ff60f9 --- include/lttng/ust-events.h | 8 ++++---- include/lttng/ust-tracepoint-event.h | 2 +- liblttng-ust-comm/lttng-ust-comm.c | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/lttng/ust-events.h b/include/lttng/ust-events.h index 946abe4b..18706fa8 100644 --- a/include/lttng/ust-events.h +++ b/include/lttng/ust-events.h @@ -71,13 +71,13 @@ enum lttng_ust_string_encoding { NR_LTTNG_UST_STRING_ENCODING, }; -struct lttng_enum_value { +struct lttng_ust_enum_value { unsigned long long value; unsigned int signedness:1; }; -enum lttng_enum_entry_options { - LTTNG_ENUM_ENTRY_OPTION_IS_AUTO = 1U << 0, +enum lttng_ust_enum_entry_option { + LTTNG_UST_ENUM_ENTRY_OPTION_IS_AUTO = 1U << 0, }; /* @@ -95,7 +95,7 @@ enum lttng_enum_entry_options { struct lttng_ust_enum_entry { uint32_t struct_size; - struct lttng_enum_value start, end; /* start and end are inclusive */ + struct lttng_ust_enum_value start, end; /* start and end are inclusive */ const char *string; unsigned int options; diff --git a/include/lttng/ust-tracepoint-event.h b/include/lttng/ust-tracepoint-event.h index 50cbfbbc..72a0cbec 100644 --- a/include/lttng/ust-tracepoint-event.h +++ b/include/lttng/ust-tracepoint-event.h @@ -194,7 +194,7 @@ void __event_template_proto___##_provider##___##_name(_TP_ARGS_DATA_PROTO(_args) .signedness = 0, \ }, \ .string = (_string), \ - .options = LTTNG_ENUM_ENTRY_OPTION_IS_AUTO, \ + .options = LTTNG_UST_ENUM_ENTRY_OPTION_IS_AUTO, \ }), #undef TP_ENUM_VALUES diff --git a/liblttng-ust-comm/lttng-ust-comm.c b/liblttng-ust-comm/lttng-ust-comm.c index 8e17e417..0b6aa293 100644 --- a/liblttng-ust-comm/lttng-ust-comm.c +++ b/liblttng-ust-comm/lttng-ust-comm.c @@ -1332,7 +1332,7 @@ int serialize_entries(struct ustctl_enum_entry **_entries, strncpy(uentry->string, lentry->string, LTTNG_UST_ABI_SYM_NAME_LEN); uentry->string[LTTNG_UST_ABI_SYM_NAME_LEN - 1] = '\0'; - if (lentry->options & LTTNG_ENUM_ENTRY_OPTION_IS_AUTO) { + if (lentry->options & LTTNG_UST_ENUM_ENTRY_OPTION_IS_AUTO) { uentry->u.extra.options |= USTCTL_UST_ENUM_ENTRY_OPTION_IS_AUTO; } -- 2.34.1