From b883a9f5be51bcfc6c3306068b4da14ea3d7bb4b Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Mon, 27 Jan 2025 12:17:19 +0900 Subject: [PATCH] strv: drop redundant string_strv_hash_ops It is completely equivalent to string_hash_ops_free_strv_free. --- src/basic/strv.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/basic/strv.c b/src/basic/strv.c index 5835a361c9..d817140cc9 100644 --- a/src/basic/strv.c +++ b/src/basic/strv.c @@ -1063,8 +1063,6 @@ int fputstrv(FILE *f, char * const *l, const char *separator, bool *space) { return 0; } -DEFINE_PRIVATE_HASH_OPS_FULL(string_strv_hash_ops, char, string_hash_func, string_compare_func, free, char*, strv_free); - static int string_strv_hashmap_put_internal(Hashmap *h, const char *key, const char *value) { char **l; int r; @@ -1115,7 +1113,7 @@ int _string_strv_hashmap_put(Hashmap **h, const char *key, const char *value HA assert(key); assert(value); - r = _hashmap_ensure_allocated(h, &string_strv_hash_ops HASHMAP_DEBUG_PASS_ARGS); + r = _hashmap_ensure_allocated(h, &string_hash_ops_free_strv_free HASHMAP_DEBUG_PASS_ARGS); if (r < 0) return r; @@ -1129,7 +1127,7 @@ int _string_strv_ordered_hashmap_put(OrderedHashmap **h, const char *key, const assert(key); assert(value); - r = _ordered_hashmap_ensure_allocated(h, &string_strv_hash_ops HASHMAP_DEBUG_PASS_ARGS); + r = _ordered_hashmap_ensure_allocated(h, &string_hash_ops_free_strv_free HASHMAP_DEBUG_PASS_ARGS); if (r < 0) return r;