]> git.ipfire.org Git - thirdparty/plymouth.git/commitdiff
ply-device-manager: Make create_devices_for_subsystem () return void
authorHans de Goede <hdegoede@redhat.com>
Wed, 5 Jun 2024 20:07:32 +0000 (22:07 +0200)
committerHans de Goede <hdegoede@redhat.com>
Fri, 7 Jun 2024 15:21:00 +0000 (17:21 +0200)
Make create_devices_for_subsystem () return void. Its callers do not care
about the return value and currently the return value is not always correct
since if a device is found, found may later become false again if
a subsequent create_devices_for_udev_device () call fails.

src/libply-splash-core/ply-device-manager.c

index 90a6066160870a3caa4474bce232fe4cb15244d8..1f41e1b2927d1e093fb413cb43326629dde8e0c5 100644 (file)
@@ -458,23 +458,22 @@ create_devices_for_udev_device (ply_device_manager_t *manager,
         return created;
 }
 
-static bool
+static void
 create_devices_for_subsystem (ply_device_manager_t *manager,
                               const char           *subsystem)
 {
         struct udev_enumerate *matches;
         struct udev_list_entry *entry;
-        bool found_device = false;
 
         if (strcmp (subsystem, SUBSYSTEM_INPUT) == 0) {
                 if (ply_kernel_command_line_has_argument ("plymouth.use-legacy-input")) {
                         ply_trace ("Not creating devices for subsystem " SUBSYSTEM_INPUT " because plymouth.use-legacy-input on command line");
-                        return false;
+                        return;
                 }
 
                 if (manager->xkb_keymap == NULL) {
                         ply_trace ("Not creating devices for subsystem " SUBSYSTEM_INPUT " because there is no configure XKB layout");
-                        return false;
+                        return;
                 }
         }
 
@@ -512,7 +511,7 @@ create_devices_for_subsystem (ply_device_manager_t *manager,
                         node = udev_device_get_devnode (device);
                         if (node != NULL) {
                                 ply_trace ("found node %s", node);
-                                found_device = create_devices_for_udev_device (manager, device);
+                                create_devices_for_udev_device (manager, device);
                         }
                 } else {
                         ply_trace ("it's not initialized");
@@ -522,8 +521,6 @@ create_devices_for_subsystem (ply_device_manager_t *manager,
         }
 
         udev_enumerate_unref (matches);
-
-        return found_device;
 }
 
 static void