Cleanup: silence cppcheck error

Not an error per se, but silences:

/home/jenkins/workspace/lttng-ust-cppcheck/liblttng-ust/lttng-ring-buffer-client.h
429	uninitvar	error	Uninitialized variable: lttng_chan
/home/jenkins/workspace/lttng-ust-cppcheck/liblttng-ust/lttng-ring-buffer-metadata-client.h
197	uninitvar	error	Uninitialized variable: lttng_chan

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

diff --git a/liblttng-ust/lttng-ring-buffer-client.h b/liblttng-ust/lttng-ring-buffer-client.h
index c65a50ef57964d92568e1ae49dfe239f6154b03a..72b6d2c8f1a21a2328f726eb94b50d6503929cd2 100644 (file)
--- a/liblttng-ust/lttng-ring-buffer-client.h
+++ b/liblttng-ust/lttng-ring-buffer-client.h
@@ -426,7 +426,8 @@ struct lttng_channel *_channel_create(const char *name,
        memcpy(chan_priv_init.uuid, uuid, LTTNG_UST_UUID_LEN);
        chan_priv_init.id = chan_id;
        handle = channel_create(&client_config, name,
-                       &priv, __alignof__(*lttng_chan), sizeof(*lttng_chan),
+                       &priv, __alignof__(struct lttng_channel),
+                       sizeof(struct lttng_channel),
                        &chan_priv_init,
                        buf_addr, subbuf_size, num_subbuf,
                        switch_timer_interval, read_timer_interval);

diff --git a/liblttng-ust/lttng-ring-buffer-metadata-client.h b/liblttng-ust/lttng-ring-buffer-metadata-client.h
index 7dbdb821095c2554d26ad839a30f4d0fdbbcb52c..89f2620c9fbd710a3adbcf30304e2a8d62d5c04a 100644 (file)
--- a/liblttng-ust/lttng-ring-buffer-metadata-client.h
+++ b/liblttng-ust/lttng-ring-buffer-metadata-client.h
@@ -194,7 +194,8 @@ struct lttng_channel *_channel_create(const char *name,
        memcpy(chan_priv_init.uuid, uuid, LTTNG_UST_UUID_LEN);
        chan_priv_init.id = chan_id;
        handle = channel_create(&client_config, name,
-                       &priv, __alignof__(*lttng_chan), sizeof(*lttng_chan),
+                       &priv, __alignof__(struct lttng_channel),
+                       sizeof(struct lttng_channel),
                        &chan_priv_init,
                        buf_addr, subbuf_size, num_subbuf,
                        switch_timer_interval, read_timer_interval);