From: David Tardon <dtardon@redhat.com>
Date: Wed, 8 Nov 2023 13:41:28 +0000 (+0100)
Subject: udev-manager: actually remove the property
X-Git-Tag: v255-rc2~75^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e1593039dbb64e47e3ec81d2c913e7730d94a727;p=thirdparty%2Fsystemd.git

udev-manager: actually remove the property

AFAICT there's no reason to keep removed entries in the Hashmap
(although it doesn't break anything either). The only use of this
hashmap is in udev_rule_apply_token_to_event(), which just retrieves the
value using hashmap_get(), hence there's no difference there between an
existing entry with a NULL value and a missing entry.
---

diff --git a/src/udev/udev-manager.c b/src/udev/udev-manager.c
index 9d86845b5f9..f2df61c4e8b 100644
--- a/src/udev/udev-manager.c
+++ b/src/udev/udev-manager.c
@@ -918,15 +918,9 @@ static int on_ctrl_msg(UdevCtrl *uctrl, UdevCtrlMessageType type, const UdevCtrl
                 }
 
                 eq++;
-                if (isempty(eq)) {
+                if (isempty(eq))
                         log_debug("Received udev control message (ENV), unsetting '%s'", key);
-
-                        r = hashmap_put(manager->properties, key, NULL);
-                        if (r < 0) {
-                                log_oom();
-                                return 1;
-                        }
-                } else {
+                else {
                         val = strdup(eq);
                         if (!val) {
                                 log_oom();