From: Susant Sahani <ssahani@vmware.com>
Date: Wed, 20 Jan 2021 14:13:02 +0000 (+0100)
Subject: udev-rules: use ordered_hashmap_ensure_put
X-Git-Tag: v248-rc1~286^2~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=875038d5fed6a04553d8c0661f4a7f5fa250ccd5;p=thirdparty%2Fsystemd.git

udev-rules: use ordered_hashmap_ensure_put
---

diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c
index db4f79fc9ac..66eef11d053 100644
--- a/src/udev/udev-rules.c
+++ b/src/udev/udev-rules.c
@@ -2147,19 +2147,17 @@ static int udev_rule_apply_token_to_event(
                 if (IN_SET(token->op, OP_ASSIGN, OP_ASSIGN_FINAL))
                         ordered_hashmap_clear_free_key(event->run_list);
 
-                r = ordered_hashmap_ensure_allocated(&event->run_list, NULL);
-                if (r < 0)
-                        return log_oom();
-
                 (void) udev_event_apply_format(event, token->value, buf, sizeof(buf), false);
 
                 cmd = strdup(buf);
                 if (!cmd)
                         return log_oom();
 
-                r = ordered_hashmap_put(event->run_list, cmd, token->data);
-                if (r < 0)
+                r = ordered_hashmap_ensure_put(&event->run_list, NULL, cmd, token->data);
+                if (r == -ENOMEM)
                         return log_oom();
+                if (r < 0)
+                        return log_rule_error_errno(dev, rules, r, "Failed to store command '%s': %m", cmd);
 
                 TAKE_PTR(cmd);