util: replace close_nointr_nofail() by a more useful safe_close()

[elogind.git] / src / libsystemd / sd-bus / test-bus-kernel.c

diff --git a/src/libsystemd/sd-bus/test-bus-kernel.c b/src/libsystemd/sd-bus/test-bus-kernel.c
index 0fab88021d1fbc1cf08d8db8a34cd6a938c36078..34d000f1c654d31e4c022ea63a1818a79c7cfba5 100644 (file)
--- a/src/libsystemd/sd-bus/test-bus-kernel.c
+++ b/src/libsystemd/sd-bus/test-bus-kernel.c
@@ -110,6 +110,9 @@ int main(int argc, char *argv[]) {
         r = sd_bus_try_close(b);
         assert_se(r == -EBUSY);
 
         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);
         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_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);
 
         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);
 
 
         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);
 
         r = sd_bus_send(b, m, NULL);
         assert_se(r >= 0);