[systemd-commits] src/nspawn src/shared

[David Herrmann]

 src/nspawn/nspawn.c  |    4 ++--
 src/shared/barrier.h |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit dfb05a1cf5479e6949d2413a633431c64d006ff2
Author: David Herrmann <dh.herrmann at gmail.com>
Date:   Tue Nov 4 09:49:43 2014 +0100

    barrier: explicitly ignore return values of barrier_place()
    
    The barrier implementation tracks remote states internally. There is no
    need to check the return value of any barrier_*() function if the caller
    is not interested in the result. The barrier helpers only return the state
    of the remote side, which is usually not interesting as later calls to
    barrier_sync() will catch this, anyway.
    
    Shut up coverity by explicitly ignoring return values of barrier_place()
    if we're not interested in it.

diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index e199eb6..fca3222 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -3371,7 +3371,7 @@ int main(int argc, char *argv[]) {
                         /* Tell the parent that we are ready, and that
                          * it can cgroupify us to that we lack access
                          * to certain devices and resources. */
-                        barrier_place(&barrier);
+                        (void)barrier_place(&barrier);
 
                         if (chdir(arg_directory) < 0) {
                                 log_error("chdir(%s) failed: %m", arg_directory);
@@ -3550,7 +3550,7 @@ int main(int argc, char *argv[]) {
                         /* Notify the child that the parent is ready with all
                          * its setup, and that the child can now hand over
                          * control to the code to run inside the container. */
-                        barrier_place(&barrier);
+                        (void)barrier_place(&barrier);
 
                         r = sd_event_new(&event);
                         if (r < 0) {
diff --git a/src/shared/barrier.h b/src/shared/barrier.h
index c55e311..d4ad2a4 100644
--- a/src/shared/barrier.h
+++ b/src/shared/barrier.h
@@ -91,6 +91,6 @@ static inline bool barrier_is_aborted(Barrier *b) {
 }
 
 static inline bool barrier_place_and_sync(Barrier *b) {
-        barrier_place(b);
+        (void)barrier_place(b);
         return barrier_sync(b);
 }