From 75026e9f596aa057bd3499a7be43a7fc8aa0b783 Mon Sep 17 00:00:00 2001 From: Francis Deslauriers Date: Wed, 18 Mar 2020 17:29:36 -0400 Subject: [PATCH] Cleanup: ust-tracepoint-event.h: extract `__num_fields` in a variable This makes it easier to understand what the `_TP_ARRAY_SIZE()` macro expands to in this context. Signed-off-by: Francis Deslauriers Signed-off-by: Mathieu Desnoyers Change-Id: I6b44e1e444df1dab0496282af4cea260ae895ca0 --- include/lttng/ust-tracepoint-event.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/include/lttng/ust-tracepoint-event.h b/include/lttng/ust-tracepoint-event.h index 0360bb6c..336125a6 100644 --- a/include/lttng/ust-tracepoint-event.h +++ b/include/lttng/ust-tracepoint-event.h @@ -781,9 +781,10 @@ void __event_probe__##_provider##___##_name(_TP_ARGS_DATA_PROTO(_args)) \ struct lttng_stack_ctx __lttng_ctx; \ size_t __event_len, __event_align; \ size_t __dynamic_len_idx = 0; \ + const size_t __num_fields = _TP_ARRAY_SIZE(__event_fields___##_provider##___##_name) - 1; \ union { \ - size_t __dynamic_len[_TP_ARRAY_SIZE(__event_fields___##_provider##___##_name) - 1]; \ - char __filter_stack_data[2 * sizeof(unsigned long) * (_TP_ARRAY_SIZE(__event_fields___##_provider##___##_name) - 1)]; \ + size_t __dynamic_len[__num_fields]; \ + char __filter_stack_data[2 * sizeof(unsigned long) * __num_fields]; \ } __stackvar; \ int __ret; \ \ -- 2.34.1