From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Tue, 26 Jan 2021 10:52:56 +0000 (+0900)
Subject: sd-device: use string_hash_ops_free_free
X-Git-Tag: v248-rc1~251^2~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dd75bbee4368b336d16759fac2352d9e2e12beaf;p=thirdparty%2Fsystemd.git

sd-device: use string_hash_ops_free_free
---

diff --git a/src/libsystemd/sd-device/sd-device.c b/src/libsystemd/sd-device/sd-device.c
index d1aa3282bf4..0d9da01daa4 100644
--- a/src/libsystemd/sd-device/sd-device.c
+++ b/src/libsystemd/sd-device/sd-device.c
@@ -65,8 +65,8 @@ static sd_device *device_free(sd_device *device) {
         free(device->properties_strv);
         free(device->properties_nulstr);
 
-        ordered_hashmap_free_free_free(device->properties);
-        ordered_hashmap_free_free_free(device->properties_db);
+        ordered_hashmap_free(device->properties);
+        ordered_hashmap_free(device->properties_db);
         hashmap_free_free_free(device->sysattr_values);
         set_free(device->sysattrs);
         set_free(device->all_tags);
@@ -93,7 +93,7 @@ int device_add_property_aux(sd_device *device, const char *_key, const char *_va
                 _cleanup_free_ char *key = NULL, *value = NULL, *old_key = NULL, *old_value = NULL;
                 int r;
 
-                r = ordered_hashmap_ensure_allocated(properties, &string_hash_ops);
+                r = ordered_hashmap_ensure_allocated(properties, &string_hash_ops_free_free);
                 if (r < 0)
                         return r;