]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
sd-netlink: use hashmap_ensure_put
authorSusant Sahani <ssahani@vmware.com>
Mon, 18 Jan 2021 13:05:35 +0000 (14:05 +0100)
committerSusant Sahani <ssahani@vmware.com>
Mon, 18 Jan 2021 20:35:31 +0000 (21:35 +0100)
src/libsystemd/sd-netlink/generic-netlink.c

index f295fa9e83f2d93bacd8ee72528c52ce66444654..38e80d8f460a1763b00d132c362c1646e41e4c51 100644 (file)
@@ -115,19 +115,11 @@ static int lookup_id(sd_netlink *nl, sd_genl_family family, uint16_t *id) {
         if (r < 0)
                 return r;
 
-        r = hashmap_ensure_allocated(&nl->genl_family_to_nlmsg_type, NULL);
+        r = hashmap_ensure_put(&nl->genl_family_to_nlmsg_type, NULL, INT_TO_PTR(family), UINT_TO_PTR(u));
         if (r < 0)
                 return r;
 
-        r = hashmap_ensure_allocated(&nl->nlmsg_type_to_genl_family, NULL);
-        if (r < 0)
-                return r;
-
-        r = hashmap_put(nl->genl_family_to_nlmsg_type, INT_TO_PTR(family), UINT_TO_PTR(u));
-        if (r < 0)
-                return r;
-
-        r = hashmap_put(nl->nlmsg_type_to_genl_family, UINT_TO_PTR(u), INT_TO_PTR(family));
+        r = hashmap_ensure_put(&nl->nlmsg_type_to_genl_family, NULL, UINT_TO_PTR(u), INT_TO_PTR(family));
         if (r < 0)
                 return r;