diff options
| -rw-r--r-- | test/kdbus-enum.c | 3 | ||||
| -rw-r--r-- | test/kdbus-util.c | 3 | ||||
| -rw-r--r-- | test/test-kdbus-benchmark.c | 4 | ||||
| -rw-r--r-- | test/test-kdbus.c | 2 |
4 files changed, 5 insertions, 7 deletions
diff --git a/test/kdbus-enum.c b/test/kdbus-enum.c index 7af202da43f..36bb5c2b872 100644 --- a/test/kdbus-enum.c +++ b/test/kdbus-enum.c @@ -95,7 +95,6 @@ LOOKUP(MATCH); TABLE(PAYLOAD) = { ENUM(KDBUS_PAYLOAD_KERNEL), - ENUM(KDBUS_PAYLOAD_DBUS1), - ENUM(KDBUS_PAYLOAD_GVARIANT), + ENUM(KDBUS_PAYLOAD_DBUS), }; LOOKUP(PAYLOAD); diff --git a/test/kdbus-util.c b/test/kdbus-util.c index 84fdc5b6225..ee94473bce6 100644 --- a/test/kdbus-util.c +++ b/test/kdbus-util.c @@ -143,7 +143,7 @@ int msg_send(const struct conn *conn, msg->src_id = conn->id; msg->dst_id = name ? 0 : dst_id; msg->cookie = cookie; - msg->payload_type = KDBUS_PAYLOAD_DBUS1; + msg->payload_type = KDBUS_PAYLOAD_DBUS; item = msg->items; @@ -582,4 +582,3 @@ void add_match_empty(int fd) if (ret < 0) fprintf(stderr, "--- error adding conn match: %d (%m)\n", ret); } - diff --git a/test/test-kdbus-benchmark.c b/test/test-kdbus-benchmark.c index 1076d5e7e74..3ce77d9ecba 100644 --- a/test/test-kdbus-benchmark.c +++ b/test/test-kdbus-benchmark.c @@ -79,7 +79,7 @@ static void add_stats(const struct timeval *tv) stats.latency_high = diff; } -static int +static int send_echo_request(struct conn *conn, uint64_t dst_id) { struct kdbus_msg *msg; @@ -123,7 +123,7 @@ send_echo_request(struct conn *conn, uint64_t dst_id) msg->size = size; msg->src_id = conn->id; msg->dst_id = dst_id; - msg->payload_type = KDBUS_PAYLOAD_DBUS1; + msg->payload_type = KDBUS_PAYLOAD_DBUS; item = msg->items; diff --git a/test/test-kdbus.c b/test/test-kdbus.c index bc1ba408346..cd9709e30f9 100644 --- a/test/test-kdbus.c +++ b/test/test-kdbus.c @@ -201,7 +201,7 @@ static int send_message(const struct kdbus_conn *conn, msg->src_id = conn->hello.id; msg->dst_id = name ? 0 : dst_id; msg->cookie = cookie; - msg->payload_type = KDBUS_PAYLOAD_DBUS1; + msg->payload_type = KDBUS_PAYLOAD_DBUS; item = msg->items; |