From dbd2df3d1395d6073d3bbab2b512b7777c7972d7 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Fri, 23 Sep 2022 12:56:54 +0200 Subject: [PATCH] all: use nm_hash_vals()/nm_hash_val() where it's shorter --- src/core/nm-manager.c | 5 +---- src/libnm-platform/nm-platform.c | 7 +++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/core/nm-manager.c b/src/core/nm-manager.c index 7cbca24ef4..5bfefb7bcc 100644 --- a/src/core/nm-manager.c +++ b/src/core/nm-manager.c @@ -632,11 +632,8 @@ static guint _device_route_metric_data_by_ifindex_hash(gconstpointer p) { const DeviceRouteMetricData *data = p; - NMHashState h; - nm_hash_init(&h, 1030338191); - nm_hash_update_vals(&h, data->ifindex); - return nm_hash_complete(&h); + return nm_hash_val(1030338191, data->ifindex); } static gboolean diff --git a/src/libnm-platform/nm-platform.c b/src/libnm-platform/nm-platform.c index 95507a8ca5..3b092bfe72 100644 --- a/src/libnm-platform/nm-platform.c +++ b/src/libnm-platform/nm-platform.c @@ -3836,11 +3836,10 @@ static guint _ip4_addr_subnets_hash(gconstpointer ptr) { const NMPlatformIP4Address *addr = NMP_OBJECT_CAST_IP4_ADDRESS(ptr); - NMHashState h; - nm_hash_init(&h, 3282159733); - nm_hash_update_vals(&h, addr->plen, nm_ip4_addr_clear_host_address(addr->address, addr->plen)); - return nm_hash_complete(&h); + return nm_hash_vals(3282159733, + addr->plen, + nm_ip4_addr_clear_host_address(addr->address, addr->plen)); } static gboolean