summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Herrmann <dh.herrmann@gmail.com>2014-11-04 09:49:43 +0100
committerDavid Herrmann <dh.herrmann@gmail.com>2014-11-04 09:49:43 +0100
commitdfb05a1cf5479e6949d2413a633431c64d006ff2 (patch)
tree2a693ecac6a57c3b69d0dbfc36c95791a42e7aba
parent44dd2c6e861316d26a78848eb0f6b35bd3b82d4b (diff)
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.
-rw-r--r--src/nspawn/nspawn.c4
-rw-r--r--src/shared/barrier.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index e199eb665a..fca3222a87 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 c55e311344..d4ad2a419b 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);
}