146 lines
5.5 KiB
Diff
146 lines
5.5 KiB
Diff
From 9d8948b3f8d37c4667a50f57ab2e357b1aeb4019 Mon Sep 17 00:00:00 2001
|
|
From: Yu Watanabe <watanabe.yu+github@gmail.com>
|
|
Date: Sun, 2 Dec 2018 07:46:33 +0100
|
|
Subject: [PATCH] hash-funcs: make basic hash_ops typesafe
|
|
|
|
(cherry picked from commit 25073e5012cdb4de13d815197815c33194ff7dc9)
|
|
|
|
Resolves: #2037807
|
|
---
|
|
src/basic/hash-funcs.c | 49 +++++++++++-------------------------------
|
|
src/basic/hash-funcs.h | 16 +++++++-------
|
|
2 files changed, 21 insertions(+), 44 deletions(-)
|
|
|
|
diff --git a/src/basic/hash-funcs.c b/src/basic/hash-funcs.c
|
|
index db48437be7..0617536ea5 100644
|
|
--- a/src/basic/hash-funcs.c
|
|
+++ b/src/basic/hash-funcs.c
|
|
@@ -5,21 +5,13 @@
|
|
#include "hash-funcs.h"
|
|
#include "path-util.h"
|
|
|
|
-void string_hash_func(const void *p, struct siphash *state) {
|
|
+void string_hash_func(const char *p, struct siphash *state) {
|
|
siphash24_compress(p, strlen(p) + 1, state);
|
|
}
|
|
|
|
-int string_compare_func(const void *a, const void *b) {
|
|
- return strcmp(a, b);
|
|
-}
|
|
-
|
|
-const struct hash_ops string_hash_ops = {
|
|
- .hash = string_hash_func,
|
|
- .compare = string_compare_func
|
|
-};
|
|
+DEFINE_HASH_OPS(string_hash_ops, char, string_hash_func, string_compare_func);
|
|
|
|
-void path_hash_func(const void *p, struct siphash *state) {
|
|
- const char *q = p;
|
|
+void path_hash_func(const char *q, struct siphash *state) {
|
|
size_t n;
|
|
|
|
assert(q);
|
|
@@ -57,14 +49,11 @@ void path_hash_func(const void *p, struct siphash *state) {
|
|
}
|
|
}
|
|
|
|
-int path_compare_func(const void *a, const void *b) {
|
|
+int path_compare_func(const char *a, const char *b) {
|
|
return path_compare(a, b);
|
|
}
|
|
|
|
-const struct hash_ops path_hash_ops = {
|
|
- .hash = path_hash_func,
|
|
- .compare = path_compare_func
|
|
-};
|
|
+DEFINE_HASH_OPS(path_hash_ops, char, path_hash_func, path_compare_func);
|
|
|
|
void trivial_hash_func(const void *p, struct siphash *state) {
|
|
siphash24_compress(&p, sizeof(p), state);
|
|
@@ -79,36 +68,24 @@ const struct hash_ops trivial_hash_ops = {
|
|
.compare = trivial_compare_func
|
|
};
|
|
|
|
-void uint64_hash_func(const void *p, struct siphash *state) {
|
|
+void uint64_hash_func(const uint64_t *p, struct siphash *state) {
|
|
siphash24_compress(p, sizeof(uint64_t), state);
|
|
}
|
|
|
|
-int uint64_compare_func(const void *_a, const void *_b) {
|
|
- uint64_t a, b;
|
|
- a = *(const uint64_t*) _a;
|
|
- b = *(const uint64_t*) _b;
|
|
- return a < b ? -1 : (a > b ? 1 : 0);
|
|
+int uint64_compare_func(const uint64_t *a, const uint64_t *b) {
|
|
+ return CMP(*a, *b);
|
|
}
|
|
|
|
-const struct hash_ops uint64_hash_ops = {
|
|
- .hash = uint64_hash_func,
|
|
- .compare = uint64_compare_func
|
|
-};
|
|
+DEFINE_HASH_OPS(uint64_hash_ops, uint64_t, uint64_hash_func, uint64_compare_func);
|
|
|
|
#if SIZEOF_DEV_T != 8
|
|
-void devt_hash_func(const void *p, struct siphash *state) {
|
|
+void devt_hash_func(const dev_t *p, struct siphash *state) {
|
|
siphash24_compress(p, sizeof(dev_t), state);
|
|
}
|
|
|
|
-int devt_compare_func(const void *_a, const void *_b) {
|
|
- dev_t a, b;
|
|
- a = *(const dev_t*) _a;
|
|
- b = *(const dev_t*) _b;
|
|
- return a < b ? -1 : (a > b ? 1 : 0);
|
|
+int devt_compare_func(const dev_t *a, const dev_t *b) {
|
|
+ return CMP(*a, *b);
|
|
}
|
|
|
|
-const struct hash_ops devt_hash_ops = {
|
|
- .hash = devt_hash_func,
|
|
- .compare = devt_compare_func
|
|
-};
|
|
+DEFINE_HASH_OPS(devt_hash_ops, dev_t, devt_hash_func, devt_compare_func);
|
|
#endif
|
|
diff --git a/src/basic/hash-funcs.h b/src/basic/hash-funcs.h
|
|
index 2d3125d0f9..3d2ae4b55e 100644
|
|
--- a/src/basic/hash-funcs.h
|
|
+++ b/src/basic/hash-funcs.h
|
|
@@ -73,12 +73,12 @@ struct hash_ops {
|
|
#define DEFINE_PRIVATE_HASH_OPS_FULL(name, type, hash_func, compare_func, free_key_func, value_type, free_value_func) \
|
|
_DEFINE_HASH_OPS_FULL(UNIQ, name, type, hash_func, compare_func, free_key_func, value_type, free_value_func, static)
|
|
|
|
-void string_hash_func(const void *p, struct siphash *state);
|
|
-int string_compare_func(const void *a, const void *b) _pure_;
|
|
+void string_hash_func(const char *p, struct siphash *state);
|
|
+#define string_compare_func strcmp
|
|
extern const struct hash_ops string_hash_ops;
|
|
|
|
-void path_hash_func(const void *p, struct siphash *state);
|
|
-int path_compare_func(const void *a, const void *b) _pure_;
|
|
+void path_hash_func(const char *p, struct siphash *state);
|
|
+int path_compare_func(const char *a, const char *b) _pure_;
|
|
extern const struct hash_ops path_hash_ops;
|
|
|
|
/* This will compare the passed pointers directly, and will not dereference them. This is hence not useful for strings
|
|
@@ -89,15 +89,15 @@ 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. */
|
|
-void uint64_hash_func(const void *p, struct siphash *state);
|
|
-int uint64_compare_func(const void *a, const void *b) _pure_;
|
|
+void uint64_hash_func(const uint64_t *p, struct siphash *state);
|
|
+int uint64_compare_func(const uint64_t *a, const uint64_t *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! */
|
|
#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_;
|
|
+void devt_hash_func(const dev_t *p, struct siphash *state) _pure_;
|
|
+int devt_compare_func(const dev_t *a, const dev_t *b) _pure_;
|
|
extern const struct hash_ops devt_hash_ops;
|
|
#else
|
|
#define devt_hash_func uint64_hash_func
|