From: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Date: Thu, 16 Jun 2022 21:36:41 +0000 (-0400)
Subject: Build fix: missing initializer for member 'payload'
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=6bd798094fff9f499d840131dd6b61104d0823ce;p=lttng-tools.git

Build fix: missing initializer for member 'payload'

gcc 5.4.0 complains that:
notification-thread-events.cpp:3755:2: warning: missing initializer for member 'lttng_notification_channel_message::payload' [-Wmissing-field-initializers]

The structure's members are initialized one by one.

Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Change-Id: I4e3f32da956764cd9beba6f4c72cfc48251b8203
---

diff --git a/src/bin/lttng-sessiond/notification-thread-events.cpp b/src/bin/lttng-sessiond/notification-thread-events.cpp
index ef066f49b..3c33ee79f 100644
--- a/src/bin/lttng-sessiond/notification-thread-events.cpp
+++ b/src/bin/lttng-sessiond/notification-thread-events.cpp
@@ -3748,14 +3748,14 @@ int client_send_command_reply(struct notification_client *client,
 	struct lttng_notification_channel_command_reply reply = {
 		.status = (int8_t) status,
 	};
-	struct lttng_notification_channel_message msg = {
-		.type = (int8_t) LTTNG_NOTIFICATION_CHANNEL_MESSAGE_TYPE_COMMAND_REPLY,
-		.size = sizeof(reply),
-		.fds = 0,
-	};
+	struct lttng_notification_channel_message msg;
 	char buffer[sizeof(msg) + sizeof(reply)];
 	enum client_transmission_status transmission_status;
 
+	msg.type = (int8_t) LTTNG_NOTIFICATION_CHANNEL_MESSAGE_TYPE_COMMAND_REPLY;
+	msg.size = sizeof(reply);
+	msg.fds = 0;
+
 	memcpy(buffer, &msg, sizeof(msg));
 	memcpy(buffer + sizeof(msg), &reply, sizeof(reply));
 	DBG("Send command reply (%i)", (int) status);
@@ -3853,15 +3853,15 @@ int client_handle_message_handshake(struct notification_client *client,
 			.major = LTTNG_NOTIFICATION_CHANNEL_VERSION_MAJOR,
 			.minor = LTTNG_NOTIFICATION_CHANNEL_VERSION_MINOR,
 	};
-	const struct lttng_notification_channel_message msg_header = {
-			.type = LTTNG_NOTIFICATION_CHANNEL_MESSAGE_TYPE_HANDSHAKE,
-			.size = sizeof(handshake_reply),
-			.fds = 0,
-	};
+	struct lttng_notification_channel_message msg_header;
 	enum lttng_notification_channel_status status =
 			LTTNG_NOTIFICATION_CHANNEL_STATUS_OK;
 	char send_buffer[sizeof(msg_header) + sizeof(handshake_reply)];
 
+	msg_header.type = LTTNG_NOTIFICATION_CHANNEL_MESSAGE_TYPE_HANDSHAKE;
+	msg_header.size = sizeof(handshake_reply);
+	msg_header.fds = 0;
+
 	memcpy(send_buffer, &msg_header, sizeof(msg_header));
 	memcpy(send_buffer + sizeof(msg_header), &handshake_reply,
 			sizeof(handshake_reply));
@@ -4363,11 +4363,11 @@ static
 int client_notification_overflow(struct notification_client *client)
 {
 	int ret = 0;
-	const struct lttng_notification_channel_message msg = {
-		.type = (int8_t) LTTNG_NOTIFICATION_CHANNEL_MESSAGE_TYPE_NOTIFICATION_DROPPED,
-		.size = 0,
-		.fds = 0,
-	};
+	struct lttng_notification_channel_message msg;
+
+	msg.type = (int8_t) LTTNG_NOTIFICATION_CHANNEL_MESSAGE_TYPE_NOTIFICATION_DROPPED;
+	msg.size = 0;
+	msg.fds = 0;
 
 	ASSERT_LOCKED(client->lock);
 
@@ -4469,16 +4469,16 @@ int notification_client_list_send_evaluation(
 		.trigger = (struct lttng_trigger *) trigger,
 		.evaluation = (struct lttng_evaluation *) evaluation,
 	};
-	struct lttng_notification_channel_message msg_header = {
-		.type = (int8_t) LTTNG_NOTIFICATION_CHANNEL_MESSAGE_TYPE_NOTIFICATION,
-		.size = 0,
-		.fds = 0,
-	};
+	struct lttng_notification_channel_message msg_header;
 	const struct lttng_credentials *trigger_creds =
 			lttng_trigger_get_credentials(trigger);
 
 	lttng_payload_init(&msg_payload);
 
+	msg_header.type = (int8_t) LTTNG_NOTIFICATION_CHANNEL_MESSAGE_TYPE_NOTIFICATION;
+	msg_header.size = 0;
+	msg_header.fds = 0;
+
 	ret = lttng_dynamic_buffer_append(&msg_payload.buffer, &msg_header,
 			sizeof(msg_header));
 	if (ret) {