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

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

diff --git a/connection.c b/connection.c
index aa6a0b05b82d1f38554c1af3084a6ce6bee7b939..2600b6468e8f0f2188fa746e304335e8ee7198d0 100644 (file)
--- 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 0be1e87048430f78a59f579cbd136b86ef1988b6..d43db6de08b5d5a9e2c045b1a24b2d9a42720b22 100644 (file)
--- 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 a7cb86f677979b40cd51e8db2c5d4aeb8ac777b7..c238d79d589d5874cd98432674fa1aa3d8147932 100644 (file)
--- 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 a7ab8c18477bbb24c142730193c7c650492abca9..264d7abf4a0f30a1c14b8cefe544a14f5d5b6ebb 100644 (file)
--- 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 4609ecfe05c9d8ae8546a92bb1c377ac6a700a7a..6cedd3f45fbdb1cb273b42322e9ba40d4813e26b 100644 (file)
--- 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 cc9d66e8556203173053e9dad8ebcd21342ca22b..db19b8163535ffcd1bc7c48d4bdec0a9dab81829 100644 (file)
--- 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 fa2d6ecbd675ccde535f8a8e568e58fd894a674c..049e56786b0ca8a6a9700add1733ad71ab1de999 100644 (file)
--- 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 5558b0bdd8f033cdc3fb2b47fca8d41ba6c868cd..0c66e79a75e43b207883189fe8d081a2f4ab8d08 100644 (file)
--- 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 67a6b5628bc92751e5e66345edf42c8d50776b1e..6a1754ee55fd2934f6011084e44a048966aacae8 100644 (file)
--- 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);