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 3dcc5d351d0a9725a03c19818a87606b4343c75f..34d000f1c654d31e4c022ea63a1818a79c7cfba5 100644 (file)
--- a/src/libsystemd/sd-bus/test-bus-kernel.c
+++ b/src/libsystemd/sd-bus/test-bus-kernel.c
@@ -39,6 +39,7 @@ int main(int argc, char *argv[]) {
         const char *ua = NULL, *ub = NULL, *the_string = NULL;
         sd_bus *a, *b;
         int r, pipe_fds[2];
+        const char *nn;
 
         log_set_max_level(LOG_DEBUG);
 
@@ -59,6 +60,9 @@ int main(int argc, char *argv[]) {
         r = sd_bus_new(&b);
         assert_se(r >= 0);
 
+        r = sd_bus_set_name(a, "a");
+        assert_se(r >= 0);
+
         r = sd_bus_set_address(a, address);
         assert_se(r >= 0);
 
@@ -79,14 +83,20 @@ int main(int argc, char *argv[]) {
 
         r = sd_bus_get_unique_name(a, &ua);
         assert_se(r >= 0);
-
         printf("unique a: %s\n", ua);
 
-        r = sd_bus_get_unique_name(b, &ub);
+        r = sd_bus_get_name(a, &nn);
         assert_se(r >= 0);
+        printf("name of a: %s\n", nn);
 
+        r = sd_bus_get_unique_name(b, &ub);
+        assert_se(r >= 0);
         printf("unique b: %s\n", ub);
 
+        r = sd_bus_get_name(b, &nn);
+        assert_se(r >= 0);
+        printf("name of b: %s\n", nn);
+
         r = sd_bus_call_method(a, "this.doesnt.exist", "/foo", "meh.mah", "muh", &error, NULL, "s", "yayayay");
         assert_se(sd_bus_error_has_name(&error, SD_BUS_ERROR_SERVICE_UNKNOWN));
         assert_se(r == -EHOSTUNREACH);
@@ -100,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);
@@ -117,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);