From 1b5d349788cd28107b90e698d11f93d140cee5d9 Mon Sep 17 00:00:00 2001 From: Susant Sahani Date: Mon, 18 Jan 2021 14:05:35 +0100 Subject: [PATCH] sd-netlink: use hashmap_ensure_put --- src/libsystemd/sd-netlink/generic-netlink.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/src/libsystemd/sd-netlink/generic-netlink.c b/src/libsystemd/sd-netlink/generic-netlink.c index f295fa9e83f..38e80d8f460 100644 --- a/src/libsystemd/sd-netlink/generic-netlink.c +++ b/src/libsystemd/sd-netlink/generic-netlink.c @@ -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; -- 2.47.3