chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Prep v228: Substitute declaration masks (1/4)
[elogind.git]
/
src
/
basic
/
hashmap.c
diff --git
a/src/basic/hashmap.c
b/src/basic/hashmap.c
index 3c0e70b9c0180d79615172f85973e4a27a43ace4..59d735326afc860d3cded89d89512d3ae7339d7d 100644
(file)
--- a/
src/basic/hashmap.c
+++ b/
src/basic/hashmap.c
@@
-20,18
+20,20
@@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
-#include <stdlib.h>
#include <errno.h>
#include <pthread.h>
#include <errno.h>
#include <pthread.h>
+#include <stdlib.h>
-#include "util.h"
+#include "
alloc-
util.h"
#include "hashmap.h"
#include "hashmap.h"
-#include "set.h"
#include "macro.h"
#include "macro.h"
-#include "siphash24.h"
-#include "strv.h"
#include "mempool.h"
#include "mempool.h"
+#include "process-util.h"
#include "random-util.h"
#include "random-util.h"
+#include "set.h"
+#include "siphash24.h"
+#include "strv.h"
+#include "util.h"
#ifdef ENABLE_DEBUG_HASHMAP
#include "list.h"
#ifdef ENABLE_DEBUG_HASHMAP
#include "list.h"
@@
-378,7
+380,7
@@
static unsigned base_bucket_hash(HashmapBase *h, const void *p) {
h->hash_ops->hash(p, &state);
h->hash_ops->hash(p, &state);
-
siphash24_finalize((uint8_t*)&hash,
&state);
+
hash = siphash24_finalize(
&state);
return (unsigned) (hash % n_buckets(h));
}
return (unsigned) (hash % n_buckets(h));
}