]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
udev-builtin: drop unnecessary 'initialized' flag
authorYu Watanabe <watanabe.yu+github@gmail.com>
Tue, 3 Dec 2024 19:52:28 +0000 (04:52 +0900)
committerYu Watanabe <watanabe.yu+github@gmail.com>
Sat, 14 Dec 2024 02:29:05 +0000 (11:29 +0900)
All builtin _init() functions can be called multiple times gracefully,
and _exit() can be called without _init() called.

src/udev/udev-builtin.c

index dc3885680f3b5805199fd2e55c0b7e988c72af5e..d533a4fa885c214bc2341120f1371ccd39e2a6eb 100644 (file)
@@ -9,8 +9,6 @@
 #include "strv.h"
 #include "udev-builtin.h"
 
-static bool initialized;
-
 static const UdevBuiltin *const builtins[_UDEV_BUILTIN_MAX] = {
 #if HAVE_BLKID
         [UDEV_BUILTIN_BLKID] = &udev_builtin_blkid,
@@ -33,25 +31,15 @@ static const UdevBuiltin *const builtins[_UDEV_BUILTIN_MAX] = {
 };
 
 void udev_builtin_init(void) {
-        if (initialized)
-                return;
-
         FOREACH_ELEMENT(b, builtins)
                 if (*b && (*b)->init)
                         (*b)->init();
-
-        initialized = true;
 }
 
 void udev_builtin_exit(void) {
-        if (!initialized)
-                return;
-
         FOREACH_ELEMENT(b, builtins)
                 if (*b && (*b)->exit)
                         (*b)->exit();
-
-        initialized = false;
 }
 
 bool udev_builtin_should_reload(void) {