summaryrefslogtreecommitdiffstats
path: root/daemon/command.c
diff options
context:
space:
mode:
authorRichard W.M. Jones <rjones@redhat.com>2011-06-09 10:10:50 +0100
committerRichard W.M. Jones <rjones@redhat.com>2011-06-09 10:53:52 +0100
commitf5096dd546ac43c7288b3ab7aec1562f070f78f6 (patch)
tree63241d95690f0cd4ea3d54472a9e29d578d743be /daemon/command.c
parent29453a58d818df24c238d0a08a68886ebe4029dd (diff)
downloadlibguestfs-f5096dd546ac43c7288b3ab7aec1562f070f78f6.tar.gz
libguestfs-f5096dd546ac43c7288b3ab7aec1562f070f78f6.tar.xz
libguestfs-f5096dd546ac43c7288b3ab7aec1562f070f78f6.zip
daemon: Keep Coverity happy by ignoring some return values.
Diffstat (limited to 'daemon/command.c')
-rw-r--r--daemon/command.c18
1 files changed, 13 insertions, 5 deletions
diff --git a/daemon/command.c b/daemon/command.c
index 5a194a4e..ef236957 100644
--- a/daemon/command.c
+++ b/daemon/command.c
@@ -26,6 +26,14 @@
#include "daemon.h"
#include "actions.h"
+#include "ignore-value.h"
+
+static inline void
+umount_ignore_fail (const char *path)
+{
+ ignore_value (command (NULL, NULL, "umount", path, NULL));
+}
+
char *
do_command (char *const *argv)
{
@@ -88,11 +96,11 @@ do_command (char *const *argv)
r = commandv (&out, &err, (const char * const *) argv);
CHROOT_OUT;
- if (sys_ok) command (NULL, NULL, "umount", sysroot_sys, NULL);
- if (selinux_ok) command (NULL, NULL, "umount", sysroot_selinux, NULL);
- if (proc_ok) command (NULL, NULL, "umount", sysroot_proc, NULL);
- if (dev_pts_ok) command (NULL, NULL, "umount", sysroot_dev_pts, NULL);
- if (dev_ok) command (NULL, NULL, "umount", sysroot_dev, NULL);
+ if (sys_ok) umount_ignore_fail (sysroot_sys);
+ if (selinux_ok) umount_ignore_fail (sysroot_selinux);
+ if (proc_ok) umount_ignore_fail (sysroot_proc);
+ if (dev_pts_ok) umount_ignore_fail (sysroot_dev_pts);
+ if (dev_ok) umount_ignore_fail (sysroot_dev);
free (sysroot_dev);
free (sysroot_dev_pts);