X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flibsystemd%2Fsd-bus%2Ftest-bus-kernel.c;h=7bb8b0a5407036f5dae157bc7b7bbd2a875ba515;hb=b39a2770ba55637da80e2e389222c59dbea73507;hp=0fab88021d1fbc1cf08d8db8a34cd6a938c36078;hpb=5972fe953ec56c77936a1e612ca87d8a0e6c0c64;p=elogind.git

diff --git a/src/libsystemd/sd-bus/test-bus-kernel.c b/src/libsystemd/sd-bus/test-bus-kernel.c
index 0fab88021..7bb8b0a54 100644
--- a/src/libsystemd/sd-bus/test-bus-kernel.c
+++ b/src/libsystemd/sd-bus/test-bus-kernel.c
@@ -101,7 +101,7 @@ int main(int argc, char *argv[]) {
         assert_se(sd_bus_error_has_name(&error, SD_BUS_ERROR_SERVICE_UNKNOWN));
         assert_se(r == -EHOSTUNREACH);
 
-        r = sd_bus_add_match(b, "interface='waldo.com',member='Piep'", NULL, NULL);
+        r = sd_bus_add_match(b, NULL, "interface='waldo.com',member='Piep'", NULL, NULL);
         assert_se(r >= 0);
 
         r = sd_bus_emit_signal(a, "/foo/bar/waldo", "waldo.com", "Piep", "sss", "I am a string", "/this/is/a/path", "and.this.a.domain.name");
@@ -110,6 +110,9 @@ int main(int argc, char *argv[]) {
         r = sd_bus_try_close(b);
         assert_se(r == -EBUSY);
 
+        r = sd_bus_process_priority(b, -10, &m);
+        assert_se(r == -ENOMSG);
+
         r = sd_bus_process(b, &m);
         assert_se(r > 0);
         assert_se(m);
@@ -127,21 +130,19 @@ int main(int argc, char *argv[]) {
         r = sd_bus_request_name(a, "net.x0pointer.foobar", 0);
         assert_se(r >= 0);
 
-        r = sd_bus_message_new_method_call(b, "net.x0pointer.foobar", "/a/path", "an.inter.face", "AMethod", &m);
+        r = sd_bus_message_new_method_call(b, &m, "net.x0pointer.foobar", "/a/path", "an.inter.face", "AMethod");
         assert_se(r >= 0);
 
         assert_se(pipe2(pipe_fds, O_CLOEXEC) >= 0);
 
         assert_se(write(pipe_fds[1], "x", 1) == 1);
 
-        close_nointr_nofail(pipe_fds[1]);
-        pipe_fds[1] = -1;
+        pipe_fds[1] = safe_close(pipe_fds[1]);
 
         r = sd_bus_message_append(m, "h", pipe_fds[0]);
         assert_se(r >= 0);
 
-        close_nointr_nofail(pipe_fds[0]);
-        pipe_fds[0] = -1;
+        pipe_fds[0] = safe_close(pipe_fds[0]);
 
         r = sd_bus_send(b, m, NULL);
         assert_se(r >= 0);