X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flibsystemd%2Fsd-bus%2Ftest-bus-server.c;h=5f807c3b1e11f25826040614087f359e37815cbb;hb=840ceb897ff2b44275dcf2fe8227a750941789f0;hp=30e2d8cf443f974f5a87be2c518cb468727640f3;hpb=0a1beeb64207eaa88ab9236787b1cbc2f704ae14;p=elogind.git

diff --git a/src/libsystemd/sd-bus/test-bus-server.c b/src/libsystemd/sd-bus/test-bus-server.c
index 30e2d8cf4..5f807c3b1 100644
--- a/src/libsystemd/sd-bus/test-bus-server.c
+++ b/src/libsystemd/sd-bus/test-bus-server.c
@@ -65,14 +65,14 @@ static void *server(void *p) {
 
                 r = sd_bus_process(bus, &m);
                 if (r < 0) {
-                        log_error_errno(-r, "Failed to process requests: %m");
+                        log_error_errno(r, "Failed to process requests: %m");
                         goto fail;
                 }
 
                 if (r == 0) {
                         r = sd_bus_wait(bus, (uint64_t) -1);
                         if (r < 0) {
-                                log_error_errno(-r, "Failed to wait: %m");
+                                log_error_errno(r, "Failed to wait: %m");
                                 goto fail;
                         }
 
@@ -90,7 +90,7 @@ static void *server(void *p) {
 
                         r = sd_bus_message_new_method_return(m, &reply);
                         if (r < 0) {
-                                log_error_errno(-r, "Failed to allocate return: %m");
+                                log_error_errno(r, "Failed to allocate return: %m");
                                 goto fail;
                         }
 
@@ -102,7 +102,7 @@ static void *server(void *p) {
                                         &reply,
                                         &SD_BUS_ERROR_MAKE_CONST(SD_BUS_ERROR_UNKNOWN_METHOD, "Unknown method."));
                         if (r < 0) {
-                                log_error_errno(-r, "Failed to allocate return: %m");
+                                log_error_errno(r, "Failed to allocate return: %m");
                                 goto fail;
                         }
                 }
@@ -110,7 +110,7 @@ static void *server(void *p) {
                 if (reply) {
                         r = sd_bus_send(bus, reply, NULL);
                         if (r < 0) {
-                                log_error_errno(-r, "Failed to send reply: %m");
+                                log_error_errno(r, "Failed to send reply: %m");
                                 goto fail;
                         }
                 }
@@ -146,10 +146,8 @@ static int client(struct context *c) {
                         "/",
                         "org.freedesktop.systemd.test",
                         "Exit");
-        if (r < 0) {
-                log_error_errno(-r, "Failed to allocate method call: %m");
-                return r;
-        }
+        if (r < 0)
+                return log_error_errno(r, "Failed to allocate method call: %m");
 
         r = sd_bus_call(bus, m, 0, &error, &reply);
         if (r < 0) {