diff options
author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2018-11-27 22:25:20 +0900 |
---|---|---|
committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2018-12-02 07:53:27 +0100 |
commit | 7a08d314f20b5d6ca44c573426a8a5c812020344 (patch) | |
tree | 871818dbd5a37c437f5dad5e6a15bcccad9c4b45 /src/basic/ether-addr-util.c | |
parent | 25073e5012cdb4de13d815197815c33194ff7dc9 (diff) | |
download | systemd-7a08d314f20b5d6ca44c573426a8a5c812020344.tar.gz |
tree-wide: make hash_ops typesafe
Diffstat (limited to 'src/basic/ether-addr-util.c')
-rw-r--r-- | src/basic/ether-addr-util.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/src/basic/ether-addr-util.c b/src/basic/ether-addr-util.c index 461ace73e2..e875696a1a 100644 --- a/src/basic/ether-addr-util.c +++ b/src/basic/ether-addr-util.c @@ -28,21 +28,15 @@ char* ether_addr_to_string(const struct ether_addr *addr, char buffer[ETHER_ADDR return buffer; } -int ether_addr_compare(const void *a, const void *b) { - assert(a); - assert(b); - +int ether_addr_compare(const struct ether_addr *a, const struct ether_addr *b) { return memcmp(a, b, ETH_ALEN); } -static void ether_addr_hash_func(const void *p, struct siphash *state) { +static void ether_addr_hash_func(const struct ether_addr *p, struct siphash *state) { siphash24_compress(p, sizeof(struct ether_addr), state); } -const struct hash_ops ether_addr_hash_ops = { - .hash = ether_addr_hash_func, - .compare = ether_addr_compare -}; +DEFINE_HASH_OPS(ether_addr_hash_ops, struct ether_addr, ether_addr_hash_func, ether_addr_compare); int ether_addr_from_string(const char *s, struct ether_addr *ret) { size_t pos = 0, n, field; |