X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Flibsystemd%2Fsd-bus%2Ftest-bus-chat.c;h=c0abc7a69795864a8ba34b16980928a4970efa60;hp=021379f0b0dadb54fa8842e3c36160a4ce867910;hb=3d94f76c99da13e5603831d0b278f8c8c21bcb02;hpb=607553f9306286fdccf0b356bc3d1087adfe21c4

diff --git a/src/libsystemd/sd-bus/test-bus-chat.c b/src/libsystemd/sd-bus/test-bus-chat.c
index 021379f0b..c0abc7a69 100644
--- a/src/libsystemd/sd-bus/test-bus-chat.c
+++ b/src/libsystemd/sd-bus/test-bus-chat.c
@@ -232,7 +232,7 @@ static int server(sd_bus *bus) {
 
                         if (write(fd, &x, 1) < 0) {
                                 log_error("Failed to write to fd: %m");
-                                close_nointr_nofail(fd);
+                                safe_close(fd);
                                 goto fail;
                         }
 
@@ -340,11 +340,11 @@ finish:
 
                 r = sd_bus_message_new_method_call(
                                 bus,
+                                &q,
                                 "org.freedesktop.systemd.test",
                                 "/",
                                 "org.freedesktop.systemd.test",
-                                "ExitClient1",
-                                &q);
+                                "ExitClient1");
                 if (r < 0)
                         log_error("Failed to allocate method call: %s", strerror(-r));
                 else
@@ -356,7 +356,7 @@ finish:
 
         sd_bus_error_free(&error);
 
-        close_pipe(pp);
+        safe_close_pair(pp);
 
         return INT_TO_PTR(r);
 }
@@ -386,11 +386,11 @@ static void* client2(void*p) {
 
         r = sd_bus_message_new_method_call(
                         bus,
+                        &m,
                         "org.freedesktop.systemd.test",
                         "/foo/bar/waldo/piep",
                         "org.object.test",
-                        "Foobar",
-                        &m);
+                        "Foobar");
         if (r < 0) {
                 log_error("Failed to allocate method call: %s", strerror(-r));
                 goto finish;
@@ -407,10 +407,10 @@ static void* client2(void*p) {
 
         r = sd_bus_message_new_signal(
                         bus,
+                        &m,
                         "/foobar",
                         "foo.bar",
-                        "Notify",
-                        &m);
+                        "Notify");
         if (r < 0) {
                 log_error("Failed to allocate signal: %s", strerror(-r));
                 goto finish;
@@ -427,11 +427,11 @@ static void* client2(void*p) {
 
         r = sd_bus_message_new_method_call(
                         bus,
+                        &m,
                         "org.freedesktop.systemd.test",
                         "/",
                         "org.freedesktop.DBus.Peer",
-                        "GetMachineId",
-                        &m);
+                        "GetMachineId");
         if (r < 0) {
                 log_error("Failed to allocate method call: %s", strerror(-r));
                 goto finish;
@@ -456,11 +456,11 @@ static void* client2(void*p) {
 
         r = sd_bus_message_new_method_call(
                         bus,
+                        &m,
                         "org.freedesktop.systemd.test",
                         "/",
                         "org.freedesktop.systemd.test",
-                        "Slow",
-                        &m);
+                        "Slow");
         if (r < 0) {
                 log_error("Failed to allocate method call: %s", strerror(-r));
                 goto finish;
@@ -480,11 +480,11 @@ static void* client2(void*p) {
 
         r = sd_bus_message_new_method_call(
                         bus,
+                        &m,
                         "org.freedesktop.systemd.test",
                         "/",
                         "org.freedesktop.systemd.test",
-                        "Slow",
-                        &m);
+                        "Slow");
         if (r < 0) {
                 log_error("Failed to allocate method call: %s", strerror(-r));
                 goto finish;
@@ -519,11 +519,11 @@ finish:
 
                 r = sd_bus_message_new_method_call(
                                 bus,
+                                &q,
                                 "org.freedesktop.systemd.test",
                                 "/",
                                 "org.freedesktop.systemd.test",
-                                "ExitClient2",
-                                &q);
+                                "ExitClient2");
                 if (r < 0) {
                         log_error("Failed to allocate method call: %s", strerror(-r));
                         goto finish;