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/journal/catalog.c | |
parent | 25073e5012cdb4de13d815197815c33194ff7dc9 (diff) | |
download | systemd-7a08d314f20b5d6ca44c573426a8a5c812020344.tar.gz |
tree-wide: make hash_ops typesafe
Diffstat (limited to 'src/journal/catalog.c')
-rw-r--r-- | src/journal/catalog.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/journal/catalog.c b/src/journal/catalog.c index 0f18d31add..51efc2b141 100644 --- a/src/journal/catalog.c +++ b/src/journal/catalog.c @@ -49,9 +49,7 @@ typedef struct CatalogItem { le64_t offset; } CatalogItem; -static void catalog_hash_func(const void *p, struct siphash *state) { - const CatalogItem *i = p; - +static void catalog_hash_func(const CatalogItem *i, struct siphash *state) { siphash24_compress(&i->id, sizeof(i->id), state); siphash24_compress(i->language, strlen(i->language), state); } @@ -69,10 +67,7 @@ static int catalog_compare_func(const CatalogItem *a, const CatalogItem *b) { return strcmp(a->language, b->language); } -const struct hash_ops catalog_hash_ops = { - .hash = catalog_hash_func, - .compare = (comparison_fn_t) catalog_compare_func, -}; +DEFINE_HASH_OPS(catalog_hash_ops, CatalogItem, catalog_hash_func, catalog_compare_func); static bool next_header(const char **s) { const char *e; |