X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fbasic%2Fhashmap.c;h=59d735326afc860d3cded89d89512d3ae7339d7d;hb=2705eaf36d46539397571886ba6ccd0045ef3e9b;hp=3c0e70b9c0180d79615172f85973e4a27a43ace4;hpb=3cd22db822df747636dcf30ebb8ec5d16bb71880;p=elogind.git
diff --git a/src/basic/hashmap.c b/src/basic/hashmap.c
index 3c0e70b9c..59d735326 100644
--- a/src/basic/hashmap.c
+++ b/src/basic/hashmap.c
@@ -20,18 +20,20 @@
along with systemd; If not, see .
***/
-#include
#include
#include
+#include
-#include "util.h"
+#include "alloc-util.h"
#include "hashmap.h"
-#include "set.h"
#include "macro.h"
-#include "siphash24.h"
-#include "strv.h"
#include "mempool.h"
+#include "process-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"
@@ -378,7 +380,7 @@ static unsigned base_bucket_hash(HashmapBase *h, const void *p) {
h->hash_ops->hash(p, &state);
- siphash24_finalize((uint8_t*)&hash, &state);
+ hash = siphash24_finalize(&state);
return (unsigned) (hash % n_buckets(h));
}