From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Tue, 9 Oct 2018 07:27:26 +0000 (+0200)
Subject: test-udev: sprinkle (void) and assert_se() as necessary
X-Git-Tag: v240~604^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F10323%2Fhead;p=thirdparty%2Fsystemd.git

test-udev: sprinkle (void) and assert_se() as necessary

CID #996263.
---

diff --git a/src/test/test-udev.c b/src/test/test-udev.c
index 5d0a63cb33c..2c67e13833a 100644
--- a/src/test/test-udev.c
+++ b/src/test/test-udev.c
@@ -82,8 +82,7 @@ int main(int argc, char *argv[]) {
                 goto out;
         }
 
-        event = udev_event_new(dev);
-        assert_se(event);
+        assert_se(event = udev_event_new(dev));
 
         assert_se(sigprocmask_many(SIG_BLOCK, NULL, SIGTERM, SIGINT, SIGHUP, SIGCHLD, -1) >= 0);
 
@@ -97,20 +96,16 @@ int main(int argc, char *argv[]) {
                         mode |= S_IFCHR;
 
                 if (!streq(action, "remove")) {
-                        mkdir_parents_label(udev_device_get_devnode(dev), 0755);
-                        mknod(udev_device_get_devnode(dev), mode, udev_device_get_devnum(dev));
+                        (void) mkdir_parents_label(udev_device_get_devnode(dev), 0755);
+                        assert_se(mknod(udev_device_get_devnode(dev), mode, udev_device_get_devnum(dev)) == 0);
                 } else {
-                        unlink(udev_device_get_devnode(dev));
-                        rmdir_parents(udev_device_get_devnode(dev), "/");
+                        assert_se(unlink(udev_device_get_devnode(dev)) == 0);
+                        (void) rmdir_parents(udev_device_get_devnode(dev), "/");
                 }
         }
 
-        udev_event_execute_rules(event,
-                                 3 * USEC_PER_SEC, USEC_PER_SEC,
-                                 NULL,
-                                 rules);
-        udev_event_execute_run(event,
-                               3 * USEC_PER_SEC, USEC_PER_SEC);
+        udev_event_execute_rules(event, 3 * USEC_PER_SEC, USEC_PER_SEC, NULL, rules);
+        udev_event_execute_run(event, 3 * USEC_PER_SEC, USEC_PER_SEC);
 out:
         mac_selinux_finish();