document that tracepoint names should ideally not be re-used

[lttng-ust.git] / include / lttng / ust-tracepoint-event.h

diff --git a/include/lttng/ust-tracepoint-event.h b/include/lttng/ust-tracepoint-event.h
index 8f0db41fc3c7c5490a38d5186661b7f68005c1af..74d06e19ad182fc5b8b863543116581f6ae12240 100644 (file)
--- a/include/lttng/ust-tracepoint-event.h
+++ b/include/lttng/ust-tracepoint-event.h
@@ -296,9 +296,10 @@ size_t __event_get_size__##_provider##___##_name(size_t *__dynamic_len, _TP_ARGS
 #define _ctf_array_encoded(_type, _item, _src, _length, _encoding, _nowrite)   \
        {                                                                      \
                unsigned long __ctf_tmp_ulong = (unsigned long) (_length);     \
+               const void *__ctf_tmp_ptr = (_src);                            \
                memcpy(__stack_data, &__ctf_tmp_ulong, sizeof(unsigned long)); \
                __stack_data += sizeof(unsigned long);                         \
-               memcpy(__stack_data, &(_src), sizeof(void **));                \
+               memcpy(__stack_data, &__ctf_tmp_ptr, sizeof(void **));         \
                __stack_data += sizeof(void **);                               \
        }
 
@@ -307,16 +308,18 @@ size_t __event_get_size__##_provider##___##_name(size_t *__dynamic_len, _TP_ARGS
                        _src_length, _encoding, _nowrite)                      \
        {                                                                      \
                unsigned long __ctf_tmp_ulong = (unsigned long) (_src_length); \
+               const void *__ctf_tmp_ptr = (_src);                            \
                memcpy(__stack_data, &__ctf_tmp_ulong, sizeof(unsigned long)); \
                __stack_data += sizeof(unsigned long);                         \
-               memcpy(__stack_data, &(_src), sizeof(void **));                \
+               memcpy(__stack_data, &__ctf_tmp_ptr, sizeof(void **));         \
                __stack_data += sizeof(void **);                               \
        }
 
 #undef _ctf_string
 #define _ctf_string(_item, _src, _nowrite)                                    \
        {                                                                      \
-               memcpy(__stack_data, &(_src), sizeof(void **));                \
+               const void *__ctf_tmp_ptr = (_src);                            \
+               memcpy(__stack_data, &__ctf_tmp_ptr, sizeof(void **));         \
                __stack_data += sizeof(void **);                               \
        }