fix: relayd: unaligned access in trace_chunk_registry_ht_key_hash

[lttng-tools.git] / src / bin / lttng-sessiond / tsdl-trace-class-visitor.cpp

diff --git a/src/bin/lttng-sessiond/tsdl-trace-class-visitor.cpp b/src/bin/lttng-sessiond/tsdl-trace-class-visitor.cpp
index 7e45f0a8a1fdbd4c0081d5b51ae7b816ca61345c..83f4a24274fc84cd47799bd2327be35713b2702d 100644 (file)
--- a/src/bin/lttng-sessiond/tsdl-trace-class-visitor.cpp
+++ b/src/bin/lttng-sessiond/tsdl-trace-class-visitor.cpp
@@ -566,7 +566,7 @@ private:
        void visit(const lst::static_length_array_type& type) final
        {
                if (type.alignment != 0) {
-                       LTTNG_ASSERT(_current_field_name.size() > 0);
+                       LTTNG_ASSERT(!_current_field_name.empty());
                        _description += lttng::format(
                                "struct {{ }} align({alignment}) {field_name}_padding;\n",
                                fmt::arg("alignment", type.alignment),
@@ -587,7 +587,7 @@ private:
                         * could wrap nested sequences in structures, which
                         * would allow us to express alignment constraints.
                         */
-                       LTTNG_ASSERT(_current_field_name.size() > 0);
+                       LTTNG_ASSERT(!_current_field_name.empty());
                        _description += lttng::format(
                                "struct {{ }} align({alignment}) {field_name}_padding;\n",
                                fmt::arg("alignment", type.alignment),
@@ -676,7 +676,7 @@ private:
        void visit_variant(const lst::variant_type<MappingIntegerType>& type)
        {
                if (type.alignment != 0) {
-                       LTTNG_ASSERT(_current_field_name.size() > 0);
+                       LTTNG_ASSERT(!_current_field_name.empty());
                        _description += lttng::format(
                                "struct {{ }} align({alignment}) {field_name}_padding;\n",
                                fmt::arg("alignment", type.alignment),
@@ -795,8 +795,14 @@ public:
 
        void visit(const lst::environment_field<const char *>& field) override
        {
+               /*
+                * clang-format 14 oscillates between two formatting for this
+                * line, disable it locally.
+                */
+               /* clang-format off */
                _environment += lttng::format(
                        "       {} = \"{}\";\n", field.name, escape_tsdl_env_string_value(field.value));
+               /* clang-format on */
        }
 
        /* Only call once. */