kdbus.h: rename 'reply' to 'msg' in struct kdbus_cmd_recv

Signed-off-by: Daniel Mack <daniel@zonque.org>

9 files changed, 22 insertions, 22 deletions

diff --git a/connection.c b/connection.c
index aa6a0b05b82..2600b6468e8 100644
--- a/connection.c
+++ b/connection.c
@@ -119,7 +119,7 @@ int kdbus_cmd_msg_recv(struct kdbus_conn *conn,
 	unsigned int lost_count;
 	int ret = 0;
 
-	if (recv->reply.offset > 0)
+	if (recv->msg.offset > 0)
 		return -EINVAL;
 
 	mutex_lock(&conn->lock);
@@ -199,14 +199,14 @@ int kdbus_cmd_msg_recv(struct kdbus_conn *conn,
 	 * Only if no PEEK is specified, the FDs are installed and the message
 	 * is dropped from internal queues.
 	 */
-	ret = kdbus_queue_entry_install(entry, conn, &recv->reply.return_flags,
+	ret = kdbus_queue_entry_install(entry, conn, &recv->msg.return_flags,
 					install);
 	if (ret < 0)
 		goto exit_unlock;
 
 	/* Give the offset+size back to the caller. */
-	kdbus_pool_slice_publish(entry->slice, &recv->reply.offset,
-				 &recv->reply.msg_size);
+	kdbus_pool_slice_publish(entry->slice, &recv->msg.offset,
+				 &recv->msg.msg_size);
 
 	if (install) {
 		kdbus_queue_entry_remove(conn, entry);
diff --git a/handle.c b/handle.c
index 0be1e870484..d43db6de08b 100644
--- a/handle.c
+++ b/handle.c
@@ -770,9 +770,9 @@ static long handle_ep_ioctl_connected(struct file *file, unsigned int cmd,
 
 		cmd_recv->return_flags = 0;
 		cmd_recv->dropped_msgs = 0;
-		cmd_recv->reply.offset = 0;
-		cmd_recv->reply.msg_size = 0;
-		cmd_recv->reply.return_flags = 0;
+		cmd_recv->msg.offset = 0;
+		cmd_recv->msg.msg_size = 0;
+		cmd_recv->msg.return_flags = 0;
 
 		ret = kdbus_items_validate(cmd_recv->items,
 					   KDBUS_ITEMS_SIZE(cmd_recv, items));
@@ -791,8 +791,8 @@ static long handle_ep_ioctl_connected(struct file *file, unsigned int cmd,
 		if (kdbus_member_set_user(&cmd_recv->dropped_msgs, buf,
 					  struct kdbus_cmd_recv,
 					  dropped_msgs) ||
-		    kdbus_member_set_user(&cmd_recv->reply, buf,
-					  struct kdbus_cmd_recv, reply) ||
+		    kdbus_member_set_user(&cmd_recv->msg, buf,
+					  struct kdbus_cmd_recv, msg) ||
 		    kdbus_member_set_user(&cmd_recv->return_flags, buf,
 					  struct kdbus_cmd_recv,
 					  return_flags))
diff --git a/kdbus.h b/kdbus.h
index a7cb86f6779..c238d79d589 100644
--- a/kdbus.h
+++ b/kdbus.h
@@ -566,7 +566,7 @@ struct kdbus_cmd_recv {
 	__u64 return_flags;
 	__s64 priority;
 	__u64 dropped_msgs;
-	struct kdbus_msg_info reply;
+	struct kdbus_msg_info msg;
 	struct kdbus_item items[0];
 } __attribute__((aligned(8)));
 
diff --git a/test/kdbus-util.c b/test/kdbus-util.c
index a7ab8c18477..264d7abf4a0 100644
--- a/test/kdbus-util.c
+++ b/test/kdbus-util.c
@@ -985,7 +985,7 @@ int kdbus_msg_recv(struct kdbus_conn *conn,
 		return ret;
 	}
 
-	msg = (struct kdbus_msg *)(conn->buf + recv.reply.offset);
+	msg = (struct kdbus_msg *)(conn->buf + recv.msg.offset);
 	ret = kdbus_msg_dump(conn, msg);
 	if (ret < 0) {
 		kdbus_msg_free(msg);
@@ -996,11 +996,11 @@ int kdbus_msg_recv(struct kdbus_conn *conn,
 		*msg_out = msg;
 
 		if (offset)
-			*offset = recv.reply.offset;
+			*offset = recv.msg.offset;
 	} else {
 		kdbus_msg_free(msg);
 
-		ret = kdbus_free(conn, recv.reply.offset);
+		ret = kdbus_free(conn, recv.msg.offset);
 		if (ret < 0)
 			return ret;
 	}
diff --git a/test/test-benchmark.c b/test/test-benchmark.c
index 4609ecfe05c..6cedd3f45fb 100644
--- a/test/test-benchmark.c
+++ b/test/test-benchmark.c
@@ -205,7 +205,7 @@ handle_echo_reply(struct kdbus_conn *conn, uint64_t send_ns)
 	if (!use_memfd)
 		goto out;
 
-	msg = (struct kdbus_msg *)(conn->buf + recv.reply.offset);
+	msg = (struct kdbus_msg *)(conn->buf + recv.msg.offset);
 
 	KDBUS_ITEM_FOREACH(item, msg, items) {
 		switch (item->type) {
@@ -235,7 +235,7 @@ out:
 	if (!has_memfd)
 		add_stats(send_ns);
 
-	ret = kdbus_free(conn, recv.reply.offset);
+	ret = kdbus_free(conn, recv.msg.offset);
 	ASSERT_RETURN_VAL(ret == 0, -errno);
 
 	return 0;
diff --git a/test/test-connection.c b/test/test-connection.c
index cc9d66e8556..db19b816353 100644
--- a/test/test-connection.c
+++ b/test/test-connection.c
@@ -143,7 +143,7 @@ int kdbus_test_byebye(struct kdbus_test_env *env)
 	ret = ioctl(conn->fd, KDBUS_CMD_RECV, &recv);
 	ASSERT_RETURN(ret == 0);
 
-	ret = kdbus_free(conn, recv.reply.offset);
+	ret = kdbus_free(conn, recv.msg.offset);
 	ASSERT_RETURN(ret == 0);
 
 	/* and try again */
diff --git a/test/test-message.c b/test/test-message.c
index fa2d6ecbd67..049e56786b0 100644
--- a/test/test-message.c
+++ b/test/test-message.c
@@ -112,7 +112,7 @@ static int msg_recv_prio(struct kdbus_conn *conn,
 		return -errno;
 	}
 
-	msg = (struct kdbus_msg *)(conn->buf + recv.reply.offset);
+	msg = (struct kdbus_msg *)(conn->buf + recv.msg.offset);
 	kdbus_msg_dump(conn, msg);
 
 	if (msg->priority != expected_prio) {
@@ -123,7 +123,7 @@ static int msg_recv_prio(struct kdbus_conn *conn,
 	}
 
 	kdbus_msg_free(msg);
-	ret = kdbus_free(conn, recv.reply.offset);
+	ret = kdbus_free(conn, recv.msg.offset);
 	if (ret < 0)
 		return ret;
 
diff --git a/test/test-timeout.c b/test/test-timeout.c
index 5558b0bdd8f..0c66e79a75e 100644
--- a/test/test-timeout.c
+++ b/test/test-timeout.c
@@ -28,7 +28,7 @@ int timeout_msg_recv(struct kdbus_conn *conn, uint64_t *expected)
 		return -errno;
 	}
 
-	msg = (struct kdbus_msg *)(conn->buf + recv.reply.offset);
+	msg = (struct kdbus_msg *)(conn->buf + recv.msg.offset);
 
 	ASSERT_RETURN_VAL(msg->payload_type == KDBUS_PAYLOAD_KERNEL, -EINVAL);
 	ASSERT_RETURN_VAL(msg->src_id == KDBUS_SRC_ID_KERNEL, -EINVAL);
@@ -38,7 +38,7 @@ int timeout_msg_recv(struct kdbus_conn *conn, uint64_t *expected)
 	kdbus_printf("Got message timeout for cookie %llu\n",
 		     msg->cookie_reply);
 
-	ret = kdbus_free(conn, recv.reply.offset);
+	ret = kdbus_free(conn, recv.msg.offset);
 	if (ret < 0)
 		return ret;
 
diff --git a/tools/kdbus-monitor.c b/tools/kdbus-monitor.c
index 67a6b5628bc..6a1754ee55f 100644
--- a/tools/kdbus-monitor.c
+++ b/tools/kdbus-monitor.c
@@ -148,7 +148,7 @@ static int dump_packet(struct conn *conn, int fd)
 		return EXIT_FAILURE;
 	}
 
-	msg = (struct kdbus_msg *)(conn->buf + recv.reply.offset);
+	msg = (struct kdbus_msg *)(conn->buf + recv.msg.offset);
 	item = msg->items;
 	size = msg->size;
 
@@ -198,7 +198,7 @@ static int dump_packet(struct conn *conn, int fd)
 	}
 
 	cmd_free.size = sizeof(cmd_free);
-	cmd_free.offset = recv.reply.offset;
+	cmd_free.offset = recv.msg.offset;
 	ret = ioctl(conn->fd, KDBUS_CMD_FREE, &cmd_free);
 	if (ret < 0) {
 		fprintf(stderr, "error free message: %d (%m)\n", ret);