tests: remove unnecessary goto
authorBartosz Golaszewski <bartekgola@gmail.com>
Mon, 27 Feb 2017 11:46:52 +0000 (12:46 +0100)
committerBartosz Golaszewski <bartekgola@gmail.com>
Mon, 27 Feb 2017 11:46:52 +0000 (12:46 +0100)
Check all loop conditions in a single if in test_prepare() and remove
the 'cont' label.

Signed-off-by: Bartosz Golaszewski <bartekgola@gmail.com>
tests/unit/gpiod-unit.c

index 0f3dba0d7bb710d064b0ccc06351ae2e6f2bf007..9083e9d686e9ba18328b441919dd2f24491d41f1 100644 (file)
@@ -304,11 +304,12 @@ static void test_prepare(struct gu_chip_descr *descr)
                devpath = udev_device_get_devpath(dev);
                devnode = udev_device_get_devnode(dev);
                sysname = udev_device_get_sysname(dev);
-               if (!devpath || !devnode || !sysname)
-                       goto cont;
 
-               if (!devpath_is_mockup(devpath))
-                       goto cont;
+               if (!devpath || !devnode || !sysname ||
+                   !devpath_is_mockup(devpath)) {
+                       udev_device_unref(dev);
+                       continue;
+               }
 
                chip = xzalloc(sizeof(*chip));
                chip->name = xstrdup(sysname);
@@ -318,8 +319,6 @@ static void test_prepare(struct gu_chip_descr *descr)
                        die("unable to determine chip number");
 
                ctx->chips[detected++] = chip;
-
-cont:
                udev_device_unref(dev);
        }