diff options
Diffstat (limited to 'src/basic/in-addr-util.c')
| -rw-r--r-- | src/basic/in-addr-util.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/src/basic/in-addr-util.c b/src/basic/in-addr-util.c index 6a00de2ef0..4bb7d9c5e0 100644 --- a/src/basic/in-addr-util.c +++ b/src/basic/in-addr-util.c @@ -603,15 +603,12 @@ int in_addr_prefix_from_string_auto_internal( } -void in_addr_data_hash_func(const void *p, struct siphash *state) { - const struct in_addr_data *a = p; - +static void in_addr_data_hash_func(const struct in_addr_data *a, struct siphash *state) { siphash24_compress(&a->family, sizeof(a->family), state); siphash24_compress(&a->address, FAMILY_ADDRESS_SIZE(a->family), state); } -int in_addr_data_compare_func(const void *a, const void *b) { - const struct in_addr_data *x = a, *y = b; +static int in_addr_data_compare_func(const struct in_addr_data *x, const struct in_addr_data *y) { int r; r = CMP(x->family, y->family); @@ -621,7 +618,4 @@ int in_addr_data_compare_func(const void *a, const void *b) { return memcmp(&x->address, &y->address, FAMILY_ADDRESS_SIZE(x->family)); } -const struct hash_ops in_addr_data_hash_ops = { - .hash = in_addr_data_hash_func, - .compare = in_addr_data_compare_func, -}; +DEFINE_HASH_OPS(in_addr_data_hash_ops, struct in_addr_data, in_addr_data_hash_func, in_addr_data_compare_func); |