shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2024-10-27 18:55:09 +03:00
Code

Merge pull request #9764 from yuwata/hash_ops-cleanups

Browse Source 
Hash ops cleanups
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2018-08-02 15:53:05 +02:00 committed by GitHub
commit 1a167ac4f6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/basic/in-addr-util.c
View File

@ -576,11 +576,7 @@ void in_addr_data_hash_func(const void *p, struct siphash *state) {
const struct in_addr_data *a = p;
siphash24_compress(&a->family, sizeof(a->family), state);
if (a->family == AF_INET)
siphash24_compress(&a->address.in, sizeof(a->address.in), state);
else if (a->family == AF_INET6)
siphash24_compress(&a->address.in6, sizeof(a->address.in6), state);
siphash24_compress(&a->address, FAMILY_ADDRESS_SIZE(a->family), state);
}
int in_addr_data_compare_func(const void *a, const void *b) {
@ -589,13 +585,7 @@ int in_addr_data_compare_func(const void *a, const void *b) {
if (x->family != y->family)
return x->family - y->family;
if (x->family == AF_INET)
return memcmp(&x->address.in.s_addr, &y->address.in.s_addr, sizeof(struct in_addr));
if (x->family == AF_INET6)
return memcmp(&x->address.in6.s6_addr, &y->address.in6.s6_addr, sizeof(struct in6_addr));
return trivial_compare_func(a, b);
return memcmp(&x->address, &y->address, FAMILY_ADDRESS_SIZE(x->family));
}
const struct hash_ops in_addr_data_hash_ops = {

7
src/network/networkd-network.c
View File

@ -36,7 +36,12 @@ static int network_config_compare_func(const void *a, const void *b) {
if (r != 0)
return r;
return y->line - x->line;
if (x->line < y->line)
return -1;
if (x->line > y->line)
return 1;
return 0;
}
const struct hash_ops network_config_hash_ops = {