[systemd-commits] 2 commits - src/libsystemd src/systemctl src/systemd

[Lennart Poettering]

 src/libsystemd/sd-bus/bus-message.c |    1 +
 src/systemctl/systemctl.c           |    2 +-
 src/systemd/sd-bus.h                |    1 -
 3 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit f2322f0b64107b2eee1fadb6c59857381277a9f8
Author: Hristo Venev <mustrumr97 at gmail.com>
Date:   Tue Aug 26 20:40:35 2014 +0200

    sd-bus: don't include internal header memfd.h in public header sd-bus.h
    
    https://bugs.freedesktop.org/show_bug.cgi?id=83097

diff --git a/src/libsystemd/sd-bus/bus-message.c b/src/libsystemd/sd-bus/bus-message.c
index c058b06..d00455a 100644
--- a/src/libsystemd/sd-bus/bus-message.c
+++ b/src/libsystemd/sd-bus/bus-message.c
@@ -28,6 +28,7 @@
 #include "strv.h"
 #include "time-util.h"
 #include "cgroup-util.h"
+#include "memfd.h"
 
 #include "sd-bus.h"
 #include "bus-message.h"
diff --git a/src/systemd/sd-bus.h b/src/systemd/sd-bus.h
index 1e23a93..036ab55 100644
--- a/src/systemd/sd-bus.h
+++ b/src/systemd/sd-bus.h
@@ -28,7 +28,6 @@
 
 #include "sd-id128.h"
 #include "sd-event.h"
-#include "memfd.h"
 #include "_sd-common.h"
 
 _SD_BEGIN_DECLARATIONS;

commit 498cfc230af8f83675be2e92057956f1792969e4
Author: Sjoerd Simons <sjoerd.simons at collabora.co.uk>
Date:   Sat Aug 23 21:11:44 2014 +0200

    systemctl: Correct error message printed when bus_process_wait fails
    
    Actually use the variable containing the return code of bus_process_wait when
    printing the error message as a result of it failing.

diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
index d9b8bee..6534819 100644
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -2382,7 +2382,7 @@ static int wait_for_jobs(sd_bus *bus, Set *s) {
         while (!set_isempty(s)) {
                 q = bus_process_wait(bus);
                 if (q < 0) {
-                        log_error("Failed to wait for response: %s", strerror(-r));
+                        log_error("Failed to wait for response: %s", strerror(-q));
                         return q;
                 }