From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Tue, 3 Dec 2024 19:52:28 +0000 (+0900)
Subject: udev-builtin: drop unnecessary 'initialized' flag
X-Git-Tag: v258-rc1~1860^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9c6c4ad1736e9c98de63645b462ded5497687de9;p=thirdparty%2Fsystemd.git

udev-builtin: drop unnecessary 'initialized' flag

All builtin _init() functions can be called multiple times gracefully,
and _exit() can be called without _init() called.
---

diff --git a/src/udev/udev-builtin.c b/src/udev/udev-builtin.c
index dc3885680f3..d533a4fa885 100644
--- a/src/udev/udev-builtin.c
+++ b/src/udev/udev-builtin.c
@@ -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) {