summaryrefslogtreecommitdiff
path: root/src/basic/hash-funcs.h
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2018-02-08 17:37:56 +0100
committerSven Eden <yamakuzure@gmx.net>2018-05-30 07:54:00 +0200
commit0c8cd4e223e968d446136379f6563d1a0aa82956 (patch)
treeaafd43a14170d9fa65264cd6da9165c05c79e696 /src/basic/hash-funcs.h
parent1b6b01c3a07ef32d6c524ae914db7af9a67e4f88 (diff)
hash-funcs: remove redundant definition of devt_hash_ops
We should assign a value only in the .c file, not in both the .c and .h file. (cherry picked from commit 9bac7d423f1d39737e2b7bc35c484ed0d79de73d)
Diffstat (limited to 'src/basic/hash-funcs.h')
-rw-r--r--src/basic/hash-funcs.h14
1 files changed, 5 insertions, 9 deletions
diff --git a/src/basic/hash-funcs.h b/src/basic/hash-funcs.h
index 959e2c101..c31ef0cc3 100644
--- a/src/basic/hash-funcs.h
+++ b/src/basic/hash-funcs.h
@@ -43,22 +43,18 @@ void trivial_hash_func(const void *p, struct siphash *state);
int trivial_compare_func(const void *a, const void *b) _const_;
extern const struct hash_ops trivial_hash_ops;
-/* 32bit values we can always just embed in the pointer itself, but
- * in order to support 32bit archs we need store 64bit values
- * indirectly, since they don't fit in a pointer. */
+/* 32bit values we can always just embed in the pointer itself, but in order to support 32bit archs we need store 64bit
+ * values indirectly, since they don't fit in a pointer. */
void uint64_hash_func(const void *p, struct siphash *state);
int uint64_compare_func(const void *a, const void *b) _pure_;
extern const struct hash_ops uint64_hash_ops;
-/* On some archs dev_t is 32bit, and on others 64bit. And sometimes
- * it's 64bit on 32bit archs, and sometimes 32bit on 64bit archs. Yuck! */
+/* On some archs dev_t is 32bit, and on others 64bit. And sometimes it's 64bit on 32bit archs, and sometimes 32bit on
+ * 64bit archs. Yuck! */
#if SIZEOF_DEV_T != 8
void devt_hash_func(const void *p, struct siphash *state) _pure_;
int devt_compare_func(const void *a, const void *b) _pure_;
-extern const struct hash_ops devt_hash_ops = {
- .hash = devt_hash_func,
- .compare = devt_compare_func
-};
+extern const struct hash_ops devt_hash_ops;
#else
#define devt_hash_func uint64_hash_func
#define devt_compare_func uint64_compare_func