From: Susant Sahani <ssahani@vmware.com>
Date: Sun, 17 Jan 2021 09:28:15 +0000 (+0100)
Subject: udev-rules: Use hashmap_ensure_put
X-Git-Tag: v248-rc1~314^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a3b42af5b65dc4a3709fa1e77968dcb578497ffa;p=thirdparty%2Fsystemd.git

udev-rules: Use hashmap_ensure_put
---

diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c
index 06a97d86713..c5c2f8cfeac 100644
--- a/src/udev/udev-rules.c
+++ b/src/udev/udev-rules.c
@@ -336,11 +336,7 @@ static int rule_resolve_user(UdevRules *rules, const char *name, uid_t *ret) {
         if (!n)
                 return -ENOMEM;
 
-        r = hashmap_ensure_allocated(&rules->known_users, &string_hash_ops);
-        if (r < 0)
-                return r;
-
-        r = hashmap_put(rules->known_users, n, UID_TO_PTR(uid));
+        r = hashmap_ensure_put(&rules->known_users, &string_hash_ops, n, UID_TO_PTR(uid));
         if (r < 0)
                 return r;
 
@@ -375,11 +371,7 @@ static int rule_resolve_group(UdevRules *rules, const char *name, gid_t *ret) {
         if (!n)
                 return -ENOMEM;
 
-        r = hashmap_ensure_allocated(&rules->known_groups, &string_hash_ops);
-        if (r < 0)
-                return r;
-
-        r = hashmap_put(rules->known_groups, n, GID_TO_PTR(gid));
+        r = hashmap_ensure_put(&rules->known_groups, &string_hash_ops, n, GID_TO_PTR(gid));
         if (r < 0)
                 return r;